From db05a41efa7e3b214c4ff9e5615434c5b8e25218 Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 20 Oct 2011 16:08:53 +0000
Subject: [PATCH] Fix OpenDJ-222: Remove more references to OpenDS. Finally update build files and refresh the SVR4 copyright notice (with latest JE license)
---
opendj-sdk/opends/build.xml | 8
opendj-sdk/opends/build-svr4.xml | 28 ++--
opendj-sdk/opends/src/svr4/OpenDJ/copyright | 235 +++++++---------------------------------------
3 files changed, 56 insertions(+), 215 deletions(-)
diff --git a/opendj-sdk/opends/build-svr4.xml b/opendj-sdk/opends/build-svr4.xml
index 1620029..ac7af53 100644
--- a/opendj-sdk/opends/build-svr4.xml
+++ b/opendj-sdk/opends/build-svr4.xml
@@ -28,12 +28,12 @@
<project name="SVR4 Packaging" basedir="." default="package-svr4">
<description>
- This is a build script that extends the OpenDS build script by adding
+ This is a build script that extends the OpenDJ build script by adding
SVR4 packaging functions.
</description>
-
- <!-- By default will build OpenDS package -->
+
+ <!-- By default will build OpenDJ package -->
<property name="product" value="${SHORT_NAME}" />
@@ -77,23 +77,23 @@
<!-- Construct SVR4 package -->
- <target name="svr4" depends="checkos,wrongos,cleansvr4,pkgversion,layout,metadata,pkgmk,zipsvr4" if="isSunOS"
+ <target name="svr4" depends="checkos,wrongos,cleansvr4,pkgversion,layout,metadata,pkgmk,zipsvr4" if="isSunOS"
description="Construct ${svr4.name} package for product ${product}.">
<echo message="Package ${svr4.name} for product ${product} built in ${svr4.dir}" />
</target>
-
+
<!-- Cleanup target -->
- <target name="cleansvr4" if="isSunOS"
+ <target name="cleansvr4" if="isSunOS"
description="Cleanup SVR4 files.">
<delete dir="${svr4.build.dir}" />
<delete dir="${svr4.dir}/${svr4.name}" />
</target>
-
+
<!-- Construct metadata data -->
- <target name="metadata" depends="pkginfo,prototype,copyright,depend" if="isSunOS"
+ <target name="metadata" depends="pkginfo,prototype,copyright,depend" if="isSunOS"
description="Construct metadata for ${svr4.name}.">
</target>
-
+
<!-- Construct pkginfo file -->
<target name="pkginfo" if="isSunOS" depends="pkgversion"
description="Create pkginfo file based on ${svr4.src.dir}/info.properties" >
@@ -123,7 +123,7 @@
</target>
<!-- Construct prototype file -->
- <target name="prototype" depends="layout" if="isSunOS"
+ <target name="prototype" depends="layout" if="isSunOS"
description="Create prototype file based on ${svr4.layout.dir}" >
<echo message="Building prototype for ${svr4.name} pkg" />
<exec executable="pkgproto" dir="${svr4.layout.dir}" output="${svr4.meta.dir}/prototype">
@@ -144,7 +144,7 @@
</target>
<!-- Construct copyright file -->
- <target name="copyright" if="isSunOS"
+ <target name="copyright" if="isSunOS"
description="Create copyright file based on ${svr4.src.dir}/copyright" >
<echo message="Building copyright for ${svr4.name} pkg" />
<copy file="${svr4.src.dir}/copyright" todir="${svr4.meta.dir}"/>
@@ -162,7 +162,7 @@
</target>
<!-- Make package -->
- <target name="pkgmk" if="isSunOS"
+ <target name="pkgmk" if="isSunOS"
description="Build ${svr4.name} package" >
<echo message="Building ${svr4.name} pkg" />
<echo message="Executing pkgmk -o -d ${svr4.dir} -r ${svr4.layout.dir} -f ${svr4.meta.dir}/prototype in ${svr4.layout.dir}" />
@@ -176,9 +176,9 @@
<arg value="${svr4.meta.dir}/prototype"/>
</exec>
</target>
-
+
<!-- ZIP package -->
- <target name="zipsvr4" if="isSunOS"
+ <target name="zipsvr4" if="isSunOS"
description="ZIP ${svr4.name} package" >
<echo message="Zipping ${svr4.name} pkg" />
<zip destfile="${svr4.dir}/${svr4.name}.zip">
diff --git a/opendj-sdk/opends/build.xml b/opendj-sdk/opends/build.xml
index e518fca..0491cc1 100644
--- a/opendj-sdk/opends/build.xml
+++ b/opendj-sdk/opends/build.xml
@@ -88,7 +88,7 @@
<property name="ads.src.dir" location="src/ads" />
<property name="ads.classes.dir" location="${classes.dir}/org/opends/admin/ads"/>
- <!-- Properties for use with the GUI Tools that go in OpenDS jar. -->
+ <!-- Properties for use with the GUI Tools that go in OpenDJ jar. -->
<property name="guitools.src.dir" location="src/guitools" />
<!-- Properties for coverage diff reports -->
@@ -1515,12 +1515,12 @@
</target>
<target name="testinit-package" depends="test.OpenDS.package.required" unless="test.OpenDS.package.required">
- <echo message="Performing full rebuild (no OpenDS zip package found)"/>
+ <echo message="Performing full rebuild (no OpenDJ zip package found)"/>
<antcall target="package"/>
</target>
<target name="testinit-recompile" depends="test.OpenDS.package.required" if="test.OpenDS.package.required">
- <echo message="Performing partial rebuild (OpenDS zip package found)"/>
+ <echo message="Performing partial rebuild (OpenDJ zip package found)"/>
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}:${admin.src.dir}:${msg.src.dir}:${msg.javagen.dir}:${ads.src.dir}:${quicksetup.src.dir}:${guitools.src.dir}"
@@ -2398,7 +2398,7 @@
<copy todir="${plugin.temp.dir}/example-plugin/lib" file="${build.dir}/build-tools/build-tools.jar" />
<copy todir="${plugin.temp.dir}/example-plugin/resource/messages/com/example/opends/messages" file="${admin.rules.dir}/example-plugin/example_plugin.properties" />
<copy todir="${plugin.temp.dir}/example-plugin/resource/messages/com/example/opends/messages" file="${admin.rules.dir}/example-plugin/example_plugin_fr.properties" />
- <!-- Package up the plugin in the OpenDS package folder. -->
+ <!-- Package up the plugin in the OpenDJ package folder. -->
<zip destfile="${pdir}/example-plugin.zip">
<zipfileset dir="${plugin.temp.dir}" filemode="644" dirmode="755" />
</zip>
diff --git a/opendj-sdk/opends/src/svr4/OpenDJ/copyright b/opendj-sdk/opends/src/svr4/OpenDJ/copyright
index 01a42c9..b621425 100644
--- a/opendj-sdk/opends/src/svr4/OpenDJ/copyright
+++ b/opendj-sdk/opends/src/svr4/OpenDJ/copyright
@@ -415,205 +415,18 @@
--------------------------------------------------------------------
-
-SUN MICROSYSTEMS, INC. SOFTWARE LICENSE AGREEMENTS
-
-SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE BELOW DEFINED SOFTWARE
-TO YOU ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN
-THIS SOFTWARE LICENSE AGREEMENT ("AGREEMENT").
-
-PLEASE READ THE AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS
-SOFTWARE, YOU ACCEPT THE FULL TERMS OF THE AGREEMENT.
-
-1. Definitions.
-
-"Software" means all the portions of the OpenDS distribution provided by Sun
-only in binary code form, and including any updates or error corrections or
-documentation provided by Sun under this Agreement.
-
-2. Permitted Uses.
-
-Subject to the terms and conditions of this Agreement and restrictions and
-exceptions set forth in the Software's documentation, Sun grants you a
-non-exclusive, non-transferable, limited license without fees to
-
-(a) reproduce and use internally the Software for the purposes of developing
-or running OpenDS or modified versions of OpenDS.
-
-(b) reproduce and distribute the Software (and also portions of Software
-identified as Redistributable in the documentation accompanying Software),
-provided that you
-
- (i) distribute the Software or Redistributables bundled as part of, and for
-the sole purpose of running, OpenDS or modified versions of OpenDS;
-
- (ii) do not remove or alter any proprietary legends or notices contained in
-or on the Software or Redistributables,
-
- (iii) only distribute the Software or Redistributables subject to a license
-agreement that protects Sun's interests consistent with the terms contained in
-this Agreement, and
-
- (iv) you agree to defend and indemnify Sun and its licensors from and against
-any damages, costs, liabilities, settlement amounts and/or expenses (including
-attorneys' fees) incurred in connection with any claim, lawsuit or action by
-any third party that arises or results from the use or distribution of any and
-all Programs, Software, or Redistributables.
-
-3. Restrictions.
-
-(a) The copies of Software provided to you under this Agreement is licensed,
-not sold, to you by Sun. Sun reserves all rights not expressly granted.
-
-(b) You may not modify Software. However if the documentation accompanying
-Software lists specific portions of Software, such as header files, class
-libraries, reference source code, and/or redistributable files, that may be
-handled differently, you may do so only as provided in the documentation.
-
-(c) You may not rent, lease, lend or encumber Software.
-
-(d) you do not remove or alter any proprietary legends or notices contained
-in the Software,
-
-(e) Unless enforcement is prohibited by applicable law, you may not decompile,
-or reverse engineer Software.
-
-(f) The terms and conditions of this Agreement will apply to any Software
-updates, provided to you at Sun's discretion, that replace and/or supplement
-the original Software, unless such update contains a separate license.
-
-(g) Software is confidential and copyrighted.
-
-(h) Software is not designed, licensed or intended for use in the design,
-construction, operation or maintenance of any nuclear facility and Sun and
-its licensors disclaim any express or implied warranty of fitness for such uses.
-
-(i) No right, title or interest in or to any trademark, service mark, logo or
-trade name of Sun or its licensors is granted under this Agreement.
-
-(j) If your Permitted Use in this Agreement permits the distribution Software
-or portions of the Software, you may only distribute the Software subject to
-a license agreement that protects Sun's interests consistent with the terms
-contained in this Agreement.
-
-4. Java Compatibility and Open Source.
-
-Software may contain Java technology. You may not create additional classes
-to, or modifications of, the Java technology, except under compatibility
-requirements available under a separate agreement available at www.java.net.
-Sun supports and benefits from the global community of open source developers,
-and thanks the community for its important contributions and open
-standards-based technology, which Sun has adopted into many of its products.
-Please note that portions of Software may be provided with notices and open
-source licenses from such communities and third parties that govern the use of
-those portions, and any licenses granted hereunder do not alter any rights and
-obligations you may have under such open source licenses, however, the
-disclaimer of warranty and limitation of liability provisions in this Agreement
-will apply to all Software in this distribution.
-
-5. Term and Termination.
-
-The Agreement is effective on the Date you receive the Software and remains
-effective until terminated. Your rights under this Agreement will terminate
-immediately without notice from Sun if you materially breach it or take any
-action in derogation of Sun's and/or its licensors' rights to Software. Sun
-may terminate this Agreement should any Software become, or in Sun's reasonable
-opinion likely to become, the subject of a claim of intellectual property
-infringement or trade secret misappropriation. Upon termination, you will
-cease use of, and destroy, Software and confirm compliance in writing to Sun.
-Sections 1, 3, 4, 5, and 7-13 will survive termination of the Agreement.
-
-6. Limited Warranty.
-
-Sun warrants to you that for a period of 90 days from the date of receipt, the
-media on which Software is furnished (if any) will be free of defects in
-materials and workmanship under normal use. Except for the foregoing, Software
-is provided "AS IS". Your exclusive remedy and Sun's entire liability under this
-limited warranty will be at Sun's option to replace Software media or refund the
-fee paid for Software. Some states do not allow limitations on certain implied
-warranties, so the above may not apply to you. This limited warranty gives you
-specific legal rights. You may have others, which vary from state to state.
-
-7. Disclaimer of Warranty.
-
-UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
-DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-8. Limitation of Liability.
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE
-LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT,
-CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE
-THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE
-SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. In no
-event will Sun's liability to you, whether in contract, tort (including
-negligence), or otherwise, exceed the amount paid by you for Software under this
-Agreement. The foregoing limitations will apply even if the above stated
-warranty fails of its essential purpose. Some states do not allow the exclusion
-of incidental or consequential damages, so some of the terms above may not be
-applicable to you.
-
-9. Export Regulations.
-
-All Software, documents, technical data, and any other materials delivered under
-this Agreement are subject to U.S. export control laws and may be subject to
-export or import regulations in other countries. You agree to comply strictly
-with these laws and regulations and acknowledge that you have the responsibility
-to obtain any licenses to export, re-export, or import as may be required after
-delivery to you.
-
-10. U.S. Government Restricted Rights.
-
-If Software is being acquired by or on behalf of the U.S. Government or by a
-U.S. Government prime contractor or subcontractor (at any tier), then the
-Government's rights in Software and accompanying documentation will be only as
-set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through
-227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101
-and 12.212 (for non-DOD acquisitions).
-
-11. Governing Law.
-
-Any action related to this Agreement will be governed by California law and
-controlling U.S. federal law. No choice of law rules of any jurisdiction will
-apply.
-
-12. Severability.
-
-If any provision of this Agreement is held to be unenforceable, this Agreement
-will remain in effect with the provision omitted, unless omission would
-frustrate the intent of the parties, in which case this Agreement will
-immediately terminate.
-
-13. Integration.
-
-This Agreement is the entire agreement between you and Sun relating to its
-subject matter. It supersedes all prior or contemporaneous oral or written
-communications, proposals, representations and warranties and prevails over any
-conflicting or additional terms of any quote, order, acknowledgment, or other
-communication between the parties relating to its subject matter during the term
-of this Agreement. No modification of this Agreement will be binding, unless in
-writing and signed by an authorized representative of each party.
-
---------------------------------------------------------------------
-
-
/*-
- * $Id: LICENSE,v 1.5 2006/01/03 21:55:06 bostic Exp $
*/
The following is the license that applies to this copy of the Berkeley
DB Java Edition software. For a license to use the Berkeley DB Java
Edition software under conditions other than those described here, or
-to purchase support for this software, please contact Sleepycat Software
-by email at info@sleepycat.com, or on the Web at http://www.sleepycat.com.
+to purchase support for this software, please contact Oracle at
+berkeleydb-info_us@oracle.com.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*
- * Copyright (c) 2002-2006
- * Sleepycat Software. All rights reserved.
+ * Copyright (c) 2002-2010 Oracle. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -634,11 +447,41 @@
* files that typically accompany the major components of the operating
* system on which the executable file runs.
*
- * THIS SOFTWARE IS PROVIDED BY SLEEPYCAT SOFTWARE ``AS IS'' AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * THIS SOFTWARE IS PROVIDED BY ORACLE ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL SLEEPYCAT SOFTWARE
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL ORACLE BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+/***
+ * ASM: a very small and fast Java bytecode manipulation framework
+ * Copyright (c) 2000-2005 INRIA, France Telecom
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
@@ -646,8 +489,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-
-
--------------------------------------------------------------------
@@ -1155,7 +996,7 @@
interest in or to any trademark, service mark, logo or trade name of
Sun or its licensors is granted under this Agreement.
-6. Term and Termination.
+6. Term and Termination.
The license and service term are set forth in your Entitlement(s). Your
rights under this Agreement will terminate immediately without notice
--
Gitblit v1.10.0