You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/10/05 09:55:09 UTC
svn commit: r1706756 - in /directory/apacheds/trunk: LICENSE NOTICE
installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
Author: elecharny
Date: Mon Oct 5 07:55:08 2015
New Revision: 1706756
URL: http://svn.apache.org/viewvc?rev=1706756&view=rev
Log:
Cleaned up the NOTICE file, updated the LICENSE files to contain what was in NITICE (AVL Set code)
Modified:
directory/apacheds/trunk/LICENSE
directory/apacheds/trunk/NOTICE
directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
Modified: directory/apacheds/trunk/LICENSE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/LICENSE?rev=1706756&r1=1706755&r2=1706756&view=diff
==============================================================================
--- directory/apacheds/trunk/LICENSE (original)
+++ directory/apacheds/trunk/LICENSE Mon Oct 5 07:55:08 2015
@@ -271,3 +271,20 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE F
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.
+
+==========================================================================
+For the AVL Set code : http://bobah.net/d4d/source-code/misc/java-avl-tree
+--------------------------------------------------------------------------
+
+Copyright 2001-2014 Vladimir Lysyy
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this source code 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.
Modified: directory/apacheds/trunk/NOTICE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/NOTICE?rev=1706756&r1=1706755&r2=1706756&view=diff
==============================================================================
--- directory/apacheds/trunk/NOTICE (original)
+++ directory/apacheds/trunk/NOTICE Mon Oct 5 07:55:08 2015
@@ -1,89 +1,6 @@
ApacheDS
-Copyright 2003-2014 The Apache Software Foundation
+Copyright 2003-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
-
-
-
-Copyright 1998-2008 The OpenLDAP Foundation
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted only as authorized by the OpenLDAP
-Public License.
-
-A copy of this license is available in the file LICENSE in the
-top-level directory of the distribution or, alternatively, at
-<http://www.OpenLDAP.org/license.html>.
-
-OpenLDAP is a registered trademark of the OpenLDAP Foundation.
-
-Individual files and/or contributed packages may be copyright by
-other parties and/or subject to additional restrictions.
-
-This work is derived from the University of Michigan LDAP v3.3
-distribution. Information concerning this software is available
-at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.
-
-This work also contains materials derived from public sources.
-
-Additional information about OpenLDAP can be obtained at
-<http://www.openldap.org/>.
-
----
-
-Portions Copyright 1998-2008 Kurt D. Zeilenga.
-Portions Copyright 1998-2006 Net Boolean Incorporated.
-Portions Copyright 2001-2006 IBM Corporation.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted only as authorized by the OpenLDAP
-Public License.
-
----
-
-Portions Copyright 1999-2007 Howard Y.H. Chu.
-Portions Copyright 1999-2007 Symas Corporation.
-Portions Copyright 1998-2003 Hallvard B. Furuseth.
-Portions Copyright 2007 Gavin Henry
-Portions Copyright 2007 Suretec Systems
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that this notice is preserved.
-The names of the copyright holders may not be used to endorse or
-promote products derived from this software without their specific
-prior written permission. This software is provided ``as is''
-without express or implied warranty.
-
----
-
-Portions Copyright (c) 1992-1996 Regents of the University of Michigan.
-All rights reserved.
-
-Redistribution and use in source and binary forms are permitted
-provided that this notice is preserved and that due credit is given
-to the University of Michigan at Ann Arbor. The name of the
-University may not be used to endorse or promote products derived
-from this software without specific prior written permission. This
-software is provided ``as is'' without express or implied warranty.
-
----
-
-Portions Copyright (c) 2001-2011 Vladimir Lysyy
-
-Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this source code 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.
Modified: directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE?rev=1706756&r1=1706755&r2=1706756&view=diff
==============================================================================
--- directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE (original)
+++ directory/apacheds/trunk/installers-maven-plugin/src/main/resources/org/apache/directory/server/installers/LICENSE Mon Oct 5 07:55:08 2015
@@ -339,3 +339,21 @@ conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
+
+==========================================================================
+For the AVL Set code : http://bobah.net/d4d/source-code/misc/java-avl-tree
+--------------------------------------------------------------------------
+
+Copyright 2001-2014 Vladimir Lysyy
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this source code 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.
+