From ff9ebc9ed4e9593360309eac406b1d021fa4d865 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Mon, 01 Jun 2015 10:24:47 +0000
Subject: [PATCH] Clean up references to copyright file in other sources
---
opendj-server-legacy/resource/debian/control/preinst | 9 +-
opendj-server-legacy/resource/debian/control/prerm | 9 +-
opendj-server-legacy/resource/rpm/specs/preuninstall.sh | 7 -
opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml | 9 +-
opendj-ldap-toolkit/src/main/assembly/bin/modrate | 6
opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch | 6
opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify | 6
opendj-server-legacy/pom.xml | 5
opendj-server-legacy/resource/debian/control/postinst | 9 +-
opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff | 7 -
opendj-maven-plugin/pom.xml | 7 -
opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch | 7 -
opendj-ldap-toolkit/src/main/assembly/bin/authrate | 6
opendj-ldap-toolkit/src/main/assembly/bin/makeldif | 7 -
opendj-config/pom.xml | 7 -
opendj-server-legacy/resource/debian/control/postrm | 9 +-
opendj-ldap-toolkit/src/main/assembly/bin/addrate | 9 +-
opendj-ldap-toolkit/src/main/assembly/bin/searchrate | 6
opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml | 7 -
opendj-server-legacy/src/main/assembly/opendj-archive-component.xml | 13 +-
opendj-server-legacy/resource/rpm/changelog | 9 +-
opendj-server-legacy/resource/rpm/specs/clean.sh | 9 +-
opendj-server-legacy/resource/sysv/opendj | 7 -
opendj-server-legacy/src/main/assembly/opendj-archive-assembly.xml | 7 -
opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare | 6
opendj-server-legacy/resource/rpm/specs/postinstall.sh | 7 -
opendj-server-legacy/resource/rpm/specs/preinstall.sh | 7 -
opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify | 6
opendj-server-legacy/resource/rpm/specs/postuninstall.sh | 7 -
opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify | 7 -
opendj-ldap-sync/src/main/assembly/bin/ldapsync | 7 -
opendj-server-legacy/resource/debian/copyright | 9 +-
32 files changed, 107 insertions(+), 132 deletions(-)
diff --git a/opendj-config/pom.xml b/opendj-config/pom.xml
index 9818d99..f189e0b 100644
--- a/opendj-config/pom.xml
+++ b/opendj-config/pom.xml
@@ -7,22 +7,21 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
!
! CDDL HEADER END
!
- ! Copyright 2013 ForgeRock AS.
+ ! Copyright 2013-2015 ForgeRock AS.
!
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/opendj-ldap-sync/src/main/assembly/bin/ldapsync b/opendj-ldap-sync/src/main/assembly/bin/ldapsync
index 86decf3..70abb51 100644
--- a/opendj-ldap-sync/src/main/assembly/bin/ldapsync
+++ b/opendj-ldap-sync/src/main/assembly/bin/ldapsync
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2011 ForgeRock AS.
+# Copyright 2011-2015 ForgeRock AS.
# This script may be used to perform LDAP search operations.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/addrate b/opendj-ldap-toolkit/src/main/assembly/bin/addrate
index 7975cc1..62bb339 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/addrate
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/addrate
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2014 ForgeRock AS
+# Copyright 2014-2015 ForgeRock AS.
OPENDJ_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AddRate"
@@ -33,4 +32,4 @@
export SCRIPT_NAME
SCRIPT_DIR=`dirname "${0}"`
-"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
\ No newline at end of file
+"${SCRIPT_DIR}/../lib/_client-script.sh" "${@}"
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/authrate b/opendj-ldap-toolkit/src/main/assembly/bin/authrate
index 9a946ba..0aaaa54 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/authrate
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/authrate
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2010 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to measure auth performance.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare b/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare
index f90ee66..bef30c3 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2006-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP compare operations.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify b/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify
index 4da38e6..9b011ea 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2006-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP add, delete, modify, and modify DN
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify b/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify
index 3839fc6..512f640 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2006-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP password modify operations.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch b/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch
index a23cddf..5b04eab 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2006-2008 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP search operations.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff b/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff
index de82167..81bffb9 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2012 ForgeRock AS.
+# Copyright 2012-2015 ForgeRock AS.
# This script may be used to compare LDIF files.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify b/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify
index b761446..f9a7c80 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2012 ForgeRock AS.
+# Copyright 2012-2015 ForgeRock AS.
# This script may be used to perform LDAP add, delete, modify, and modify DN
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch b/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch
index 4c9d2c0..962c85c 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2012 ForgeRock AS.
+# Copyright 2012-2015 ForgeRock AS.
# This script may be used to perform search operations against an LDIF file.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/makeldif b/opendj-ldap-toolkit/src/main/assembly/bin/makeldif
index 58e7261..8c0a262 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/makeldif
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/makeldif
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -23,7 +22,7 @@
# CDDL HEADER END
#
#
-# Copyright 2013 ForgeRock AS.
+# Copyright 2013-2015 ForgeRock AS.
# This script may be used to perform LDAP add, delete, modify, and modify DN
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/modrate b/opendj-ldap-toolkit/src/main/assembly/bin/modrate
index fa4cdd1..4501c68 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/modrate
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/modrate
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2009 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP search operations.
diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/searchrate b/opendj-ldap-toolkit/src/main/assembly/bin/searchrate
index 238e290..eca21e2 100644
--- a/opendj-ldap-toolkit/src/main/assembly/bin/searchrate
+++ b/opendj-ldap-toolkit/src/main/assembly/bin/searchrate
@@ -7,15 +7,14 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
@@ -24,6 +23,7 @@
#
#
# Copyright 2009 Sun Microsystems, Inc.
+# Portions Copyright 2015 ForgeRock AS.
# This script may be used to perform LDAP search operations.
diff --git a/opendj-maven-plugin/pom.xml b/opendj-maven-plugin/pom.xml
index bed999a..de94f07 100644
--- a/opendj-maven-plugin/pom.xml
+++ b/opendj-maven-plugin/pom.xml
@@ -7,15 +7,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
@@ -61,4 +60,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 3baa946..2fb6827 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -7,15 +7,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
diff --git a/opendj-server-legacy/resource/debian/control/postinst b/opendj-server-legacy/resource/debian/control/postinst
index 7703ffd..9b023d8 100644
--- a/opendj-server-legacy/resource/debian/control/postinst
+++ b/opendj-server-legacy/resource/debian/control/postinst
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
#
set -e
@@ -67,4 +66,4 @@
fi
fi
# End post install script
-echo
\ No newline at end of file
+echo
diff --git a/opendj-server-legacy/resource/debian/control/postrm b/opendj-server-legacy/resource/debian/control/postrm
index 2ae6337..6aae1c5 100644
--- a/opendj-server-legacy/resource/debian/control/postrm
+++ b/opendj-server-legacy/resource/debian/control/postrm
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
#
set -e
@@ -35,4 +34,4 @@
echo *OpenDJ successfully removed
fi
echo
-# End of the post rm script
\ No newline at end of file
+# End of the post rm script
diff --git a/opendj-server-legacy/resource/debian/control/preinst b/opendj-server-legacy/resource/debian/control/preinst
index 0fb0099..fc35a58 100644
--- a/opendj-server-legacy/resource/debian/control/preinst
+++ b/opendj-server-legacy/resource/debian/control/preinst
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
#
set -e
@@ -43,4 +42,4 @@
fi
fi
echo
-# End of the pre installation script
\ No newline at end of file
+# End of the pre installation script
diff --git a/opendj-server-legacy/resource/debian/control/prerm b/opendj-server-legacy/resource/debian/control/prerm
index 4448773..705db58 100644
--- a/opendj-server-legacy/resource/debian/control/prerm
+++ b/opendj-server-legacy/resource/debian/control/prerm
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
#
set -e
@@ -34,4 +33,4 @@
if [ "$1" = "remove" ] && ( [ -f ${deb.prefix}/config/buildinfo ] && [ "$(ls -A ${deb.prefix}/config/archived-configs)" ] ) ; then
${deb.prefix}/bin/./stop-ds
fi
-# End prem script
\ No newline at end of file
+# End prem script
diff --git a/opendj-server-legacy/resource/debian/copyright b/opendj-server-legacy/resource/debian/copyright
index 2902396..9858b2c 100644
--- a/opendj-server-legacy/resource/debian/copyright
+++ b/opendj-server-legacy/resource/debian/copyright
@@ -3,7 +3,7 @@
Upstream-Contact: Forgerock <opendj@forgerock.org>
Source: http://opendj.forgerock.org/
Files: *
-Copyright: 2013-2015 ForgeRock AS
+Copyright: 2013-2015 ForgeRock AS.
License: CDDL
CDDL HEADER START
.
@@ -12,15 +12,14 @@
(the "License"). You may not use this file except in compliance
with the License.
.
- You can obtain a copy of the license at
- trunk/opendj3/legal-notices/CDDLv1_0.txt
+ You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
or http://forgerock.org/license/CDDLv1.0.html.
See the License for the specific language governing permissions
and limitations under the License.
.
When distributing Covered Code, include this CDDL HEADER in each
file and include the License file at
- trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ legal-notices/CDDLv1_0.txt. If applicable,
add the following below this CDDL HEADER, with the fields enclosed
by brackets "[]" replaced with your own identifying information:
Portions Copyright [yyyy] [name of copyright owner]
@@ -103,4 +102,4 @@
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.
\ No newline at end of file
+ THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/opendj-server-legacy/resource/rpm/changelog b/opendj-server-legacy/resource/rpm/changelog
index 1c0ffd9..656b354 100644
--- a/opendj-server-legacy/resource/rpm/changelog
+++ b/opendj-server-legacy/resource/rpm/changelog
@@ -6,22 +6,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# =============================
# opendj rpm package changelog
@@ -45,4 +44,4 @@
- Fixed the sections' order and added a new "clean" section.
- Added '%doc' section.
- Added '%changelog' at the end of the file.
-- Added license to header's files.
\ No newline at end of file
+- Added license to header's files.
diff --git a/opendj-server-legacy/resource/rpm/specs/clean.sh b/opendj-server-legacy/resource/rpm/specs/clean.sh
index 325e016..f07831b 100644
--- a/opendj-server-legacy/resource/rpm/specs/clean.sh
+++ b/opendj-server-legacy/resource/rpm/specs/clean.sh
@@ -7,25 +7,24 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# =========================
# RPM Clean script (%clean)
# =========================
-[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"
\ No newline at end of file
+[ "${RPM_BUILD_ROOT}" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"
diff --git a/opendj-server-legacy/resource/rpm/specs/postinstall.sh b/opendj-server-legacy/resource/rpm/specs/postinstall.sh
index 50e2eb6..f82be5f 100644
--- a/opendj-server-legacy/resource/rpm/specs/postinstall.sh
+++ b/opendj-server-legacy/resource/rpm/specs/postinstall.sh
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# ===============================
# RPM Post Install Script (%post)
diff --git a/opendj-server-legacy/resource/rpm/specs/postuninstall.sh b/opendj-server-legacy/resource/rpm/specs/postuninstall.sh
index 6cbb864..f98274d 100644
--- a/opendj-server-legacy/resource/rpm/specs/postuninstall.sh
+++ b/opendj-server-legacy/resource/rpm/specs/postuninstall.sh
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# ===================================
# RPM Post Uninstall Script (%postun)
diff --git a/opendj-server-legacy/resource/rpm/specs/preinstall.sh b/opendj-server-legacy/resource/rpm/specs/preinstall.sh
index 40025f9..a67a037 100644
--- a/opendj-server-legacy/resource/rpm/specs/preinstall.sh
+++ b/opendj-server-legacy/resource/rpm/specs/preinstall.sh
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# =============================
# RPM Pre Install Script (%pre)
diff --git a/opendj-server-legacy/resource/rpm/specs/preuninstall.sh b/opendj-server-legacy/resource/rpm/specs/preuninstall.sh
index fc5174f..b160a80 100644
--- a/opendj-server-legacy/resource/rpm/specs/preuninstall.sh
+++ b/opendj-server-legacy/resource/rpm/specs/preuninstall.sh
@@ -7,22 +7,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
# =================================
# RPM Pre Uninstall Script (%preun)
diff --git a/opendj-server-legacy/resource/sysv/opendj b/opendj-server-legacy/resource/sysv/opendj
index 5c511a3..91c8a24 100755
--- a/opendj-server-legacy/resource/sysv/opendj
+++ b/opendj-server-legacy/resource/sysv/opendj
@@ -11,22 +11,21 @@
# (the "License"). You may not use this file except in compliance
# with the License.
#
-# You can obtain a copy of the license at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt
+# You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
# or http://forgerock.org/license/CDDLv1.0.html.
# See the License for the specific language governing permissions
# and limitations under the License.
#
# When distributing Covered Code, include this CDDL HEADER in each
# file and include the License file at
-# trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+# legal-notices/CDDLv1_0.txt. If applicable,
# add the following below this CDDL HEADER, with the fields enclosed
# by brackets "[]" replaced with your own identifying information:
# Portions Copyright [yyyy] [name of copyright owner]
#
# CDDL HEADER END
#
-# Copyright 2013-2015 ForgeRock AS
+# Copyright 2013-2015 ForgeRock AS.
#
diff --git a/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml b/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
index b23e32e..98af248 100644
--- a/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
+++ b/opendj-server-legacy/src/main/assembly/dsml-war-assembly.xml
@@ -6,15 +6,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
@@ -74,4 +73,4 @@
<outputDirectory>WEB-INF/classes/resources</outputDirectory>
</file>
</files>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-assembly.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-assembly.xml
index d5b417f..4b7c24c 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-assembly.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-assembly.xml
@@ -6,15 +6,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
@@ -32,4 +31,4 @@
<componentDescriptors>
<componentDescriptor>src/main/assembly/opendj-archive-component.xml</componentDescriptor>
</componentDescriptors>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
index b4a5421..7ea9a15 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-archive-component.xml
@@ -7,15 +7,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
@@ -84,7 +83,7 @@
</includes>
<fileMode>755</fileMode>
</fileSet>
-
+
<!-- Adds bat in lib/ directory -->
<fileSet>
<directory>${basedir}/resource/bin</directory>
@@ -197,7 +196,7 @@
<directory>${basedir}/resource/config</directory>
<outputDirectory>template/config</outputDirectory>
<includes>
- <include>*.*</include>
+ <include>*.*</include>
</includes>
<excludes>
<exclude>config.ldif</exclude>
@@ -286,13 +285,13 @@
</fileSet>
</fileSets>
<files>
-
+
<!-- Adds Generated config.ldif file -->
<file>
<source>${project.build.directory}/template/config/config.ldif</source>
<outputDirectory>template/config</outputDirectory>
</file>
-
+
<!-- Adds logo png to root directory -->
<file>
<source>${basedir}/resource/images/opendj_logo.png</source>
diff --git a/opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml b/opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml
index 72892fc..7062a89 100644
--- a/opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml
+++ b/opendj-server-legacy/src/main/assembly/opendj-snmp-archive-assembly.xml
@@ -6,15 +6,14 @@
! (the "License"). You may not use this file except in compliance
! with the License.
!
- ! You can obtain a copy of the license at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt
+ ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
! or http://forgerock.org/license/CDDLv1.0.html.
! See the License for the specific language governing permissions
! and limitations under the License.
!
! When distributing Covered Code, include this CDDL HEADER in each
! file and include the License file at
- ! trunk/opendj3/legal-notices/CDDLv1_0.txt. If applicable,
+ ! legal-notices/CDDLv1_0.txt. If applicable,
! add the following below this CDDL HEADER, with the fields enclosed
! by brackets "[]" replaced with your own identifying information:
! Portions Copyright [yyyy] [name of copyright owner]
@@ -33,7 +32,7 @@
<componentDescriptors>
<componentDescriptor>src/main/assembly/opendj-archive-component.xml</componentDescriptor>
</componentDescriptors>
-
+
<!-- Assembly descriptor SNMP complement for OpenDJ archive -->
<fileSets>
<!-- Adds src/snmp/resource/security folder -->
@@ -54,4 +53,4 @@
<outputDirectory>lib/extensions</outputDirectory>
</file>
</files>
-</assembly>
\ No newline at end of file
+</assembly>
--
Gitblit v1.10.0