From fef7a843b23b1174cc565780871a7fc6f120df5e Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 09 Mar 2016 09:08:15 +0000
Subject: [PATCH] Fix duplicate ForgeRock copyrights + "Portions Copyright" which should have been "Copyright"
---
opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java | 5 ++---
opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java | 6 +-----
opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java | 3 +--
opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java | 9 +++++----
opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java | 14 ++++++--------
6 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
index ec9ae5a..7a2612f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/api/AuthenticationPolicyState.java
@@ -11,8 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Portions Copyright 2011-2016 ForgeRock AS.
- * Portions Copyright 2014 ForgeRock AS.
+ * Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.api;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
index f3161a6..a3506ee 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/plugins/ChangeNumberControlPlugin.java
@@ -12,30 +12,28 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2006-2008 Sun Microsystems, Inc.
- * Portions Copyright 2011-2015 ForgeRock AS.
- * Portions Copyright 2013 ForgeRock AS.
+ * Portions Copyright 2011-2016 ForgeRock AS.
*/
package org.opends.server.plugins;
+import java.io.IOException;
import java.util.List;
import java.util.Set;
-
import java.util.TreeSet;
-import java.io.IOException;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigChangeResult;
+import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.io.ASN1Writer;
import org.opends.server.admin.server.ConfigurationChangeListener;
import org.opends.server.admin.std.meta.PluginCfgDefn;
import org.opends.server.admin.std.server.ChangeNumberControlPluginCfg;
import org.opends.server.admin.std.server.PluginCfg;
import org.opends.server.api.plugin.DirectoryServerPlugin;
-import org.opends.server.api.plugin.PluginType;
import org.opends.server.api.plugin.PluginResult;
-import org.forgerock.opendj.config.server.ConfigException;
-import org.forgerock.opendj.io.ASN1Writer;
+import org.opends.server.api.plugin.PluginType;
import org.opends.server.replication.common.CSN;
import org.opends.server.replication.protocol.OperationContext;
-import org.forgerock.opendj.config.server.ConfigChangeResult;
import org.opends.server.types.Control;
import org.opends.server.types.operation.PostOperationAddOperation;
import org.opends.server.types.operation.PostOperationDeleteOperation;
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java b/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java
index afc4254..a43494a 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/protocols/asn1/GSERParser.java
@@ -12,17 +12,18 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2013-2014 Manuel Gaupp
- * Copyright 2014-2015 ForgeRock AS.
- * Portions Copyright 2014 ForgeRock AS.
+ * Portions Copyright 2014-2016 ForgeRock AS.
*/
package org.opends.server.protocols.asn1;
+import static org.forgerock.util.Reject.*;
+import static org.opends.messages.ProtocolMessages.*;
+
import java.math.BigInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+
import org.forgerock.i18n.LocalizableMessage;
-import static org.opends.messages.ProtocolMessages.*;
-import static org.forgerock.util.Reject.*;
/**
* This class implements a parser for strings which are encoded using the
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java
index 3edcbc9..d287c7b 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/CoreSchemaProvider.java
@@ -12,7 +12,6 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2014-2016 ForgeRock AS.
- * Portions Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.schema;
@@ -33,9 +32,7 @@
import org.opends.server.types.InitializationException;
import org.opends.server.types.Schema.SchemaUpdater;
-/**
- * Provides the core schema, which includes core matching rules and syntaxes.
- */
+/** Provides the core schema, which includes core matching rules and syntaxes. */
public class CoreSchemaProvider implements SchemaProvider<CoreSchemaCfg>,
ConfigurationChangeListener<CoreSchemaCfg>
{
@@ -43,7 +40,6 @@
/** The current configuration of core schema. */
private CoreSchemaCfg currentConfig;
-
private ServerContext serverContext;
@Override
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java
index 533301e..7056b07 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SchemaProvider.java
@@ -12,16 +12,15 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2014-2016 ForgeRock AS.
- * Portions Copyright 2014-2015 ForgeRock AS.
*/
package org.opends.server.schema;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.server.config.server.SchemaProviderCfg;
-import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.core.ServerContext;
import org.opends.server.types.InitializationException;
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
index d34631a..6c4df03 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/common/MultiDomainServerStateTest.java
@@ -11,17 +11,16 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2013-2014 ForgeRock AS.
- * Portions Copyright 2014-2016 ForgeRock AS.
+ * Copyright 2013-2016 ForgeRock AS.
*/
package org.opends.server.replication.common;
import static org.assertj.core.api.Assertions.*;
import static org.testng.Assert.*;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.util.Pair;
import org.opends.server.replication.ReplicationTestCase;
-import org.forgerock.opendj.ldap.DN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
--
Gitblit v1.10.0