aboutsummaryrefslogtreecommitdiffstats
path: root/lib/orber/doc/src/Orber
diff options
context:
space:
mode:
authorBruce Yinhe <[email protected]>2015-06-18 11:31:02 +0200
committerBruce Yinhe <[email protected]>2015-06-18 11:31:02 +0200
commit738c34d4bb8f1a3811acd00af8c6c12107f8315b (patch)
tree3e29144e3d6890e2da3762e2eb48cf56a6c9de5b /lib/orber/doc/src/Orber
parentef3dd7ebc24c6bbc74d4b823cd057222bccbe1cf (diff)
downloadotp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.gz
otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.tar.bz2
otp-738c34d4bb8f1a3811acd00af8c6c12107f8315b.zip
Change license text to APLv2
Diffstat (limited to 'lib/orber/doc/src/Orber')
-rw-r--r--lib/orber/doc/src/Orber/InitialReference.java21
-rw-r--r--lib/orber/doc/src/Orber/Makefile21
2 files changed, 22 insertions, 20 deletions
diff --git a/lib/orber/doc/src/Orber/InitialReference.java b/lib/orber/doc/src/Orber/InitialReference.java
index 300de59139..0ae2ebfb68 100644
--- a/lib/orber/doc/src/Orber/InitialReference.java
+++ b/lib/orber/doc/src/Orber/InitialReference.java
@@ -3,16 +3,17 @@
*
* Copyright Ericsson AB 1997-2009. All Rights Reserved.
*
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*
* %CopyrightEnd%
*
diff --git a/lib/orber/doc/src/Orber/Makefile b/lib/orber/doc/src/Orber/Makefile
index 49da975a8b..278fa182ee 100644
--- a/lib/orber/doc/src/Orber/Makefile
+++ b/lib/orber/doc/src/Orber/Makefile
@@ -3,16 +3,17 @@
#
# Copyright Ericsson AB 1997-2009. All Rights Reserved.
#
-# The contents of this file are subject to the Erlang Public License,
-# Version 1.1, (the "License"); you may not use this file except in
-# compliance with the License. You should have received a copy of the
-# Erlang Public License along with this software. If not, it can be
-# retrieved online at http://www.erlang.org/.
-#
-# Software distributed under the License is distributed on an "AS IS"
-# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-# the License for the specific language governing rights and limitations
-# under the License.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
#
# %CopyrightEnd%
#