mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Gaetan Boismal
23.16.2015 1e62bcce71e1b04ac12ec4ba67a2fa1ec84cf67e
OPENDJ-2089 Fix licenses
1 files copied
2 files deleted
1 files added
1 files renamed
5 files modified
649 ■■■■■ changed files
README 2 ●●● patch | view | raw | blame | history
legal-notices/README.txt 7 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap-servlet/legal-notices/THIRDPARTYREADME.txt 111 ●●●●● patch | view | raw | blame | history
opendj-rest2ldap-servlet/pom.xml 20 ●●●● patch | view | raw | blame | history
opendj-server-legacy/legal-notices/THIRDPARTYREADME.txt 7 ●●●● patch | view | raw | blame | history
opendj-server-legacy/resource/legal-notices/CDDLv1_0.txt 384 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/resource/legal-notices/THIRDPARTYREADME.txt 76 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml 18 ●●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml 16 ●●●● patch | view | raw | blame | history
pom.xml 8 ●●●●● patch | view | raw | blame | history
README
@@ -1,7 +1,7 @@
OpenDJ
This Maven project contains the OpenDJ product suite, comprising of an open
source LDAP Directory Server, client tools, and LDAP SDK. All modules are 100%
source LDAP Directory Server and client tools. All modules are 100%
Java based and require Java 7. 
OpenDJ is a downstream build of the OpenDS project, with a different name
legal-notices/README.txt
New file
@@ -0,0 +1,7 @@
Third party licences of the OpenDJ project are located in the following paths:
    OpenDJ server and DSML webapp:
        ./opendj-server-legacy/legal-notices/THIRDPARTYREADME.txt
    OpenDJ Rest2Ldap Gateway:
        ./opendj-rest2ldap-servlet/legal-notices/THIRDPARTYREADME.txt
opendj-rest2ldap-servlet/legal-notices/THIRDPARTYREADME.txt
copy from legal-notices/THIRDPARTYREADME.txt copy to opendj-rest2ldap-servlet/legal-notices/THIRDPARTYREADME.txt
File was copied from legal-notices/THIRDPARTYREADME.txt
@@ -10,12 +10,6 @@
Version: jackson-mapper-asl.jar (1.9.2)
Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
Version: forgerock-persistit-core.jar (4.0.0)
Copyright: Copyright 2011-2012 Akiban Technologies, Inc.
Version: freemarker.jar (2.3.21)
Copyright: Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
==================
Full license text:
==================
@@ -99,24 +93,12 @@
Version: activation-1.1.jar
Copyright: Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
Version: javax.mail-1.4.7.jar
Version: javax.mail-1.5.1.jar
Copyright: Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved.
Version: grizzly-framework.jar (2.3.14)
Copyright: Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
Version: grizzly-http-server.jar (2.3.16)
Copyright: Copyright (c) 2011 Oracle and/or its affiliates. All rights reserved.
Version: grizzly-http-servlet.jar (2.3.16)
Copyright: Copyright (c) 2008-2012 Oracle and/or its affiliates. All rights reserved.
Version: grizzly-http.jar (2.3.16)
Copyright: Copyright (c) 2009-2013 Oracle and/or its affiliates. All rights reserved.
Version: servlet-api-3.1-b02.jar
Copyright: Copyright (c) 2008-2010 Oracle and/or its affiliates. All rights reserved.
==================
Full license text:
@@ -260,9 +242,6 @@
Version: slf4j-api.jar (1.7.5)
Copyright: Copyright (c) 2004-2011 QOS.ch. All rights reserved.
Version: slf4j-jdk14.jar (1.7.5)
Copyright: Copyright (c) 2004-2011 QOS.ch. All rights reserved.
==================
Full license text:
==================
@@ -288,91 +267,3 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
***************************************************************************
Berkeley DB Java Edition software
***************************************************************************
Version: je.jar (5.0.104)
Copyright: Copyright (c) 2002,2008 Oracle.  All rights reserved.
==================
Full license text:
==================
/*-
 * $Id: LICENSE,v 1.12 2008/01/07 14:28:36 cwl 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 Oracle at
berkeleydb-info_us@oracle.com.
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
/*
 * Copyright (c) 2002,2008 Oracle.  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. Redistributions in any form must be accompanied by information on
 *    how to obtain complete source code for the DB software and any
 *    accompanying software that uses the DB software.  The source code
 *    must either be included in the distribution or be available for no
 *    more than the cost of distribution plus a nominal fee, and must be
 *    freely redistributable under reasonable conditions.  For an
 *    executable file, complete source code means the source code for all
 *    modules it contains.  It does not include source code for modules or
 *    files that typically accompany the major components of the operating
 *    system on which the executable file runs.
 *
 * 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 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
 * 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.
 */
opendj-rest2ldap-servlet/pom.xml
@@ -78,15 +78,25 @@
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-war-plugin</artifactId>
        <configuration>
          <webResources>
          <webResources>
            <!-- Include CDDLv1_0.txt -->
            <resource>
              <targetPath>WEB-INF/legal-notices</targetPath>
              <directory>../legal-notices</directory>
              <excludes>
                <!-- The web-app does not include the documentation -->
                <exclude>CC-BY-NC-ND.txt</exclude>
              </excludes>
              <includes>
                <include>CDDLv1_0.txt</include>
              </includes>
            </resource>
            <!-- Include THIRDPARTYREADME.txt -->
            <resource>
              <targetPath>WEB-INF/legal-notices</targetPath>
              <directory>legal-notices</directory>
              <includes>
                <include>THIRDPARTYREADME.txt</include>
              </includes>
            </resource>
            <resource>
              <targetPath>/</targetPath>
              <directory>src/main/webapp/</directory>
opendj-server-legacy/legal-notices/THIRDPARTYREADME.txt
File was renamed from legal-notices/THIRDPARTYREADME.txt
@@ -10,12 +10,9 @@
Version: jackson-mapper-asl.jar (1.9.2)
Copyright: Copyright (c) 2007- Tatu Saloranta, tatu.saloranta@iki.fi
Version: forgerock-persistit-core.jar (4.0.0)
Version: forgerock-persistit-core.jar (4.1.0)
Copyright: Copyright 2011-2012 Akiban Technologies, Inc.
Version: freemarker.jar (2.3.21)
Copyright: Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
==================
Full license text:
==================
@@ -99,7 +96,7 @@
Version: activation-1.1.jar
Copyright: Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
Version: javax.mail-1.4.7.jar
Version: javax.mail-1.5.1.jar
Copyright: Copyright (c) 2005-2010 Oracle and/or its affiliates. All rights reserved.
Version: grizzly-framework.jar (2.3.14)
opendj-server-legacy/resource/legal-notices/CDDLv1_0.txt
File was deleted
opendj-server-legacy/resource/legal-notices/THIRDPARTYREADME.txt
File was deleted
opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
@@ -54,6 +54,24 @@
      <outputDirectory>legal-notices</outputDirectory>
    </fileSet>
    <!-- Add legal-notices/THIRDPARTYREADME.txt -->
    <fileSet>
      <directory>${basedir}/legal-notices</directory>
      <outputDirectory>WEB-INF/legal-notices</outputDirectory>
      <includes>
        <include>THIRDPARTYREADME.txt</include>
      </includes>
    </fileSet>
    <!-- Add legal-notices/CDDLv1_0.txt -->
    <fileSet>
      <directory>${basedir}/../legal-notices</directory>
      <outputDirectory>WEB-INF/legal-notices</outputDirectory>
      <includes>
        <include>CDDLv1_0.txt</include>
      </includes>
    </fileSet>
    <fileSet>
      <directory>${jars.dir}/</directory>
      <outputDirectory>WEB-INF/lib</outputDirectory>
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -67,10 +67,22 @@
      <directoryMode>755</directoryMode>
    </fileSet>
    <!-- Creates legal-notices/ directory -->
    <!-- Add legal-notices/THIRDPARTYREADME.txt -->
    <fileSet>
      <directory>${basedir}/resource/legal-notices</directory>
      <directory>${basedir}/legal-notices</directory>
      <outputDirectory>legal-notices</outputDirectory>
      <includes>
        <include>THIRDPARTYREADME.txt</include>
      </includes>
    </fileSet>
    <!-- Add legal-notices/CDDLv1_0.txt -->
    <fileSet>
      <directory>${basedir}/../legal-notices</directory>
      <outputDirectory>legal-notices</outputDirectory>
      <includes>
        <include>CDDLv1_0.txt</include>
      </includes>
    </fileSet>
    <!-- Include the Forgerock binary license file if exists -->
pom.xml
@@ -91,15 +91,7 @@
  </distributionManagement>
  <modules>
    <module>opendj-maven-plugin</module>
    <module>opendj-copyright-maven-plugin</module>
    <module>opendj-doc-maven-plugin</module>
    <module>opendj-core</module>
    <module>opendj-grizzly</module>
    <module>opendj-config</module>
    <module>opendj-cli</module>
    <module>opendj-ldap-toolkit</module>
    <module>opendj-ldap-sdk-examples</module>
    <module>opendj-rest2ldap</module>
    <module>opendj-rest2ldap-servlet</module>
    <module>opendj-server</module>
    <module>opendj-server-example-plugin</module>