From 3c1fa5e3bbf2c06153a060f0490c5f10668f42e3 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 17 Feb 2015 09:19:11 +0000
Subject: [PATCH] Missed copyright updates from following revisions: r11761 r11760 r11759 r11758 r11757 r11756 r11755 r11750 r11747
---
opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java | 14 +-
opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java | 2
opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java | 7 -
opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java | 9 -
opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java | 5
opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java | 2
opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java | 6 -
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java | 3
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java | 14 +-
opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java | 7 -
opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java | 4
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java | 5
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java | 2
opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java | 6 -
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java | 2
opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java | 3
opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java | 5
opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java | 5
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 3
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java | 4
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java | 2
opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java | 3
opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java | 9 -
opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java | 7 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java | 2
opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java | 9 -
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java | 2
opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java | 2
opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java | 3
opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java | 6 -
opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java | 2
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java | 4
opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java | 9 -
opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java | 2
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java | 3
opendj-server-legacy/src/main/java/org/opends/server/api/Group.java | 8 -
opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java | 4
opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java | 2
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java | 3
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java | 3
opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java | 4
opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java | 22 ++--
opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java | 2
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java | 2
opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java | 4
opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java | 2
66 files changed, 101 insertions(+), 179 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
index 83fd2f6..c5d116e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ADSContext.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
-
package org.opends.admin.ads;
import static org.forgerock.util.Utils.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
index f35be36..b47ba1b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/admin/ads/ServerDescriptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2007-2010 Sun Microsystems, Inc.
- * Portion Copyright 2013-2014 ForgeRock AS.
+ * Portion Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.admin.ads;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
index b2ffd1e..d4eb377 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/browser/NodeRefresher.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.browser;
import java.util.ArrayList;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
index 8b55f5c..0fa1271 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/datamodel/ServerDescriptor.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.guitools.controlpanel.datamodel;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 433564b..ddb3667 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
index 6051ca1..3dac7bf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/InclusionExclusionPanel.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
index d6c9deb..c75d1a9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/JavaPropertiesPanel.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
index 08edd16..306ca9e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/ProgressDialog.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui;
import static org.opends.messages.AdminToolMessages.*;
@@ -61,7 +60,6 @@
/**
* The dialog that is used to display progress in a task.
- *
*/
public class ProgressDialog extends GenericDialog
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
index ff92726..4bb0a16 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/components/DoubleAddRemovePanel.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui.components;
import static org.opends.messages.AdminToolMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
index e745a0b..390dc93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/renderer/LDAPEntryTableCellRenderer.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.guitools.controlpanel.ui.renderer;
import static org.opends.messages.AdminToolMessages.*;
@@ -50,7 +49,6 @@
/**
* The renderer used by the table in the 'Attribute View' of the LDAP entry
* browser.
- *
*/
public class LDAPEntryTableCellRenderer extends SelectableTableCellRenderer
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
index 007b28b..b2e4a0f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/ConfigFromDirContext.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2011 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
-
package org.opends.guitools.controlpanel.util;
import static org.opends.messages.AdminToolMessages.*;
@@ -80,7 +79,6 @@
/**
* A class that reads the configuration and monitoring information using a
* DirContext through LDAP.
- *
*/
public class ConfigFromDirContext extends ConfigReader
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
index 665b13b..3673f94 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/BuildInformation.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
-
package org.opends.quicksetup;
import static org.opends.messages.QuickSetupMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
index 8800ef2..04d754b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataReplicationPanel.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
-
package org.opends.quicksetup.installer.ui;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
index e46ae2e..3c37a9f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/ui/Utilities.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.quicksetup.ui;
+
import org.forgerock.i18n.LocalizableMessage;
import static com.forgerock.opendj.util.OperatingSystem.isMacOS;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
index b936f8a..4f857f3 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/admin/client/spi/PropertySet.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
-
package org.opends.server.admin.client.spi;
-
-
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -39,8 +37,6 @@
import org.opends.server.admin.PropertyDefinition;
import org.opends.server.admin.PropertyOption;
-
-
/**
* A set of properties. Instances of this class can be used as the
* core of a managed object implementation.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
index e09570b..1fa4a5a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AttributeSyntax.java
@@ -22,14 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS.
+ * Portions Copyright 2012-2015 ForgeRock AS.
*/
package org.opends.server.api;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
-
import java.util.List;
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
@@ -39,7 +37,6 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.i18n.LocalizableMessageBuilder;
-
/**
* This class defines the set of methods and structures that must be
* implemented by a Directory Server module that implements an
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
index 72ae543..7eb4f60 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/Group.java
@@ -22,14 +22,12 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.api;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
-
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -45,8 +43,6 @@
import org.opends.server.types.SearchFilter;
import org.forgerock.opendj.ldap.SearchScope;
-
-
/**
* This class defines the set of methods that must be implemented by a
* Directory Server group. It is expected that there will be a number
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
index dd8030e..60431fd 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciListenerManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
index 560970a..333cd98 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/AciTargets.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
index 291893d..64e1ec8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/DNS.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
index 99f5915..b49a0f2 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/ParentInheritance.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.authorization.dseecompat;
+
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AccessControlMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
index 583db64..ab11541 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/PatternDN.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.authorization.dseecompat;
+
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.types.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
index d00dbb3..a23b4e5 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/Permission.java
@@ -22,9 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
+
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.authorization.dseecompat.Aci.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
index c8e4915..fafc78c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargAttrFilterList.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
index de8e5e7..30dd080 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/TargetAttr.java
@@ -22,10 +22,10 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
-
package org.opends.server.authorization.dseecompat;
+
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.AccessControlMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
index 91c6abc..e4d5da9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/authorization/dseecompat/UserAttr.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.authorization.dseecompat;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
index ca39474..f1bca10 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/DNConfigAttribute.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -45,6 +44,7 @@
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
+
/**
* This class defines a DN configuration attribute, which can hold zero or more
* DN values.
@@ -59,9 +59,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
// The set of active values for this attribute.
private List<DN> activeValues;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
index c0437e1..d454b17 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/IntegerConfigAttribute.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -45,6 +44,7 @@
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
+
/**
* This class defines an integer configuration attribute, which can hold zero or
* more integer values. For scalability, the actual values will be stored as
@@ -61,9 +61,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
// The set of active values for this attribute.
private List<Long> activeValues;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
index 50aa49d..1323f93 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/JMXMBean.java
@@ -22,7 +22,7 @@
*
*
* Portions Copyright 2006-2007-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.config;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
index 289a360..fdb91f6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/MultiChoiceConfigAttribute.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -45,6 +44,7 @@
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
+
/**
* This class defines a multi-choice configuration attribute, which can hold
* zero or more string values. A user-defined set of allowed values will be
@@ -60,9 +60,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
// The set of active values for this attribute.
private List<String> activeValues;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java b/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
index 9950d49..9637c27 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/config/StringConfigAttribute.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.config;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.LinkedHashSet;
@@ -45,6 +44,7 @@
import static org.opends.server.config.ConfigConstants.*;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import static org.opends.messages.ConfigMessages.*;
+
/**
* This class defines a string configuration attribute, which can hold zero or
* more string values.
@@ -59,9 +59,6 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
-
-
-
// The set of active values for this attribute.
private List<String> activeValues;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
index 8d77c7e..89b15d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/GetEffectiveRightsRequestControl.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.controls;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
index 60aa7e6..2e5a655 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/controls/ServerSideSortRequestControl.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.controls;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
index 6172058..1dc7186 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/extensions/SASLContext.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS.
+ * Portions Copyright 2011-2015 ForgeRock AS.
*/
package org.opends.server.extensions;
@@ -57,8 +57,6 @@
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ByteString;
-
-
/**
* This class defines the SASL context needed to process GSSAPI and DIGEST-MD5
* bind requests from clients.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
index fb1a5b5..843b0c4 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/jmx/DirectoryRMIServerSocketFactory.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.jmx;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
index 502a79e..b94be4b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/ldap/LDAPRequestHandler.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap;
-
-
import static org.opends.messages.ProtocolMessages.*;
import static org.opends.server.loggers.AccessLogger.logConnect;
import static org.opends.server.util.StaticUtils.*;
@@ -54,7 +52,6 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.LDAPException;
-
/**
* This class defines an LDAP request handler, which is associated with an LDAP
* connection handler and is responsible for reading and decoding any requests
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
index d872b88..5573f45 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/NotAssuredUpdateMsg.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.replication.server;
@@ -44,7 +44,6 @@
* class to keep a reference to the real object, but that will overwrite the
* assured flag value to false when serializing the message, and return false
* when calling the isAssured() method.
- *
*/
class NotAssuredUpdateMsg extends UpdateMsg
{
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java
index 28950d4..2b68fec 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/replication/server/changelog/file/Record.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.replication.server.changelog.file;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
index b57ef3d..e966a57 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -42,7 +40,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class implements the enhanced guide attribute syntax, which may be used
* to provide criteria for generating search filters for entries of a given
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
index a5901a0..d7b2b0d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/GuideSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -42,7 +40,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class implements the guide attribute syntax, which may be used to
* provide criteria for generating search filters for entries, optionally tied
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
index 2096f89..6e51632 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.opends.server.api.AttributeSyntax;
@@ -35,8 +33,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
-
-
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteSequence;
import static org.opends.messages.SchemaMessages.*;
@@ -44,7 +40,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class implements the name and optional UID attribute syntax, which holds
* values consisting of a DN, optionally followed by an octothorpe (#) and a bit
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
index 2c37591..56cf95c 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/NumericStringSyntax.java
@@ -22,12 +22,10 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
-
-
import org.opends.server.admin.std.server.AttributeSyntaxCfg;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.schema.MatchingRule;
@@ -42,7 +40,6 @@
import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.util.StaticUtils.*;
-
/**
* This class implements the numeric string attribute syntax, which may be hold
* one or more numeric digits and/or spaces. Equality, ordering, and substring
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
index fd2ca2d..b00e214 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ObjectClassSyntax.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
package org.opends.server.schema;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
index c14c460..351934b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/ManageTasks.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2009 Sun Microsystems, Inc.
- * Portions Copyright 2012-2014 ForgeRock AS
+ * Portions Copyright 2012-2015 ForgeRock AS
*/
-
package org.opends.server.tools;
import org.forgerock.i18n.LocalizableMessage;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
index e145581..3950c53 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
@@ -22,30 +22,26 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
-import org.forgerock.i18n.LocalizableMessage;
-
+import static org.opends.messages.ToolMessages.*;
+import static org.opends.server.util.StaticUtils.*;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.Attribute;
import org.opends.server.types.AttributeType;
-import org.forgerock.opendj.ldap.ByteString;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
-import static org.opends.messages.ToolMessages.*;
-import static org.opends.server.util.StaticUtils.*;
-
-
-
/**
* This class defines a branch that should be included in the resulting LDIF. A
* branch may or may not have subordinate entries.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
index f367415..c42632a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/RDNTag.java
@@ -22,21 +22,17 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
-import org.forgerock.i18n.LocalizableMessage;
-
-
-
-import java.util.List;
-
-import org.opends.server.types.DN;
-import org.opends.server.types.InitializationException;
import static org.opends.messages.ToolMessages.*;
+import java.util.List;
+import org.forgerock.i18n.LocalizableMessage;
+import org.opends.server.types.DN;
+import org.opends.server.types.InitializationException;
/**
* This class defines a tag that is used to include the RDN of the current entry
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
index 6f75c4e..775f687 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Template.java
@@ -22,13 +22,12 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
+
import org.forgerock.i18n.LocalizableMessage;
-
-
import java.io.IOException;
import java.util.HashSet;
import java.util.Map;
@@ -39,8 +38,6 @@
import static org.opends.messages.ToolMessages.*;
import static org.opends.server.util.StaticUtils.*;
-
-
/**
* This class defines a template, which is a pattern that may be used to
* generate entries. A template may be used either below a branch or below
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
index aa04d71..4fd023d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/TemplateLine.java
@@ -22,11 +22,10 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS
*/
package org.opends.server.tools.makeldif;
-
-
import org.opends.server.types.AttributeType;
/**
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
index 40bdd57..30b3831 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/tasks/TaskClient.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
-
package org.opends.server.tools.tasks;
import static org.opends.messages.ToolMessages.*;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
index ab5f75c..fe9730e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DITStructureRule.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
index 2797b9f..3ad478b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/DirectoryEnvironmentConfig.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java b/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
index 4a1c174..73e7a44 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/EntryEncodeConfig.java
@@ -22,23 +22,19 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.ByteSequenceReader;
-
-
import org.forgerock.i18n.LocalizableMessage;
import org.opends.server.api.CompressedSchema;
import org.opends.server.core.DirectoryServer;
import static org.opends.messages.CoreMessages.*;
-
-
/**
* This class defines a data structure that contains configuration
* information about how an entry should be encoded.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
index bbb9278..9fec00a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LDAPSyntaxDescription.java
@@ -22,10 +22,8 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
-
-
package org.opends.server.types;
import java.util.LinkedHashMap;
@@ -38,8 +36,6 @@
import static org.forgerock.util.Reject.*;
import static org.opends.server.util.ServerConstants.*;
-
-
/**
* This class defines a data structure for storing and interacting
* with an ldap syntax, which defines the custom ldap syntaxes.
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
index 4073e1f..af334d7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/LockManager.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java b/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
index 906b6a3..ba269cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/MatchingRuleUse.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
index 18b3baf..a557af1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/Modification.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2014 ForgeRock AS
+ * Portions Copyright 2014-2015 ForgeRock AS
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java b/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
index c36ef72..dc25eeb 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/NameForm.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
index c0372d4..9dd25b6 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/types/ObjectClass.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.types;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
index f5b7c7e..92fb2e1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/CertificateManager.java
@@ -22,9 +22,8 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
-
package org.opends.server.util;
import java.io.*;
@@ -35,7 +34,6 @@
import org.forgerock.i18n.LocalizableMessage;
import static org.opends.messages.UtilityMessages.*;
-
/**
* This class provides an interface for generating self-signed certificates and
* certificate signing requests, and for importing, exporting, and deleting
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
index c008b76..c6b6dea 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/LDIFWriter.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS.
+ * Portions Copyright 2013-2015 ForgeRock AS.
*/
package org.opends.server.util;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java b/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
index 679837c..c1d26b7 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/VersionCompatibilityIssue.java
@@ -22,23 +22,23 @@
*
*
* Copyright 2007-2009 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
-
package org.opends.server.util;
-import org.forgerock.i18n.LocalizableMessage;
-import org.opends.quicksetup.BuildInformation;
import static org.opends.messages.VersionMessages.*;
-import java.util.Set;
-import java.util.List;
-import java.util.Collections;
-import java.util.HashSet;
+import org.forgerock.i18n.LocalizableMessage;
+import org.opends.quicksetup.BuildInformation;
+
import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.Comparator;
import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.EnumSet;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
/**
* Record for version compatibility issues (also known as 'flag days') which
@@ -601,6 +601,7 @@
static private final Comparator<VersionCompatibilityIssue>
VERSION_COMPARATOR = new Comparator<VersionCompatibilityIssue>()
{
+ @Override
public int compare(VersionCompatibilityIssue o1,
VersionCompatibilityIssue o2) {
return o1.getVersion().compareTo(o2.getVersion());
@@ -636,6 +637,7 @@
*
* @return A string representation of this version compatibility issue.
*/
+ @Override
public String toString() {
return Integer.toString(cause.getId());
}
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
index ab30c37..28c6bbe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/util/cli/LDAPConnectionConsoleInteraction.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.util.cli;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
index cad62e4..1df8b45 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyDNOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.workflowelement.localbackend;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
index 771f515..4dc1727 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendModifyOperation.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2011 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.workflowelement.localbackend;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
index 3e0afce..0d57434 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/workflowelement/localbackend/LocalBackendWorkflowElement.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2015 ForgeRock AS
*/
package org.opends.server.workflowelement.localbackend;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
index 9d3ba29..89223be 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/LdapTestCase.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2013-2014 ForgeRock AS
+ * Portions Copyright 2013-2015 ForgeRock AS
*/
package org.opends.server.protocols.ldap ;
--
Gitblit v1.10.0