From 1382e65f5fbdd25c528197c7c2aa55bdcf8ae5f2 Mon Sep 17 00:00:00 2001 From: Bruno Lavit Date: Fri, 18 Dec 2015 10:17:17 +0100 Subject: [PATCH 001/125] [maven-release-plugin] prepare for next development iteration --- opendj-cli/pom.xml | 2 +- opendj-copyright-maven-plugin/pom.xml | 2 +- opendj-core/pom.xml | 2 +- opendj-doc-maven-plugin/pom.xml | 2 +- opendj-grizzly/pom.xml | 2 +- opendj-ldap-sdk-examples/pom.xml | 2 +- opendj-ldap-toolkit/pom.xml | 2 +- opendj-rest2ldap/pom.xml | 2 +- opendj-sdk-parent/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index dac9b76c8..c2b67ef7c 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml opendj-cli diff --git a/opendj-copyright-maven-plugin/pom.xml b/opendj-copyright-maven-plugin/pom.xml index 1df418532..640329775 100644 --- a/opendj-copyright-maven-plugin/pom.xml +++ b/opendj-copyright-maven-plugin/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index a7e81c830..4d3ddac2b 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index ec089001a..08f323458 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml index 07c05b4a6..bacb5eb8f 100644 --- a/opendj-grizzly/pom.xml +++ b/opendj-grizzly/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index a86f7009f..6cd9b403d 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index e488f9c2f..0e41b7f79 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -30,7 +30,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 2c69d289b..f05eba474 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -21,7 +21,7 @@ opendj-sdk-parent org.forgerock.opendj - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT ../opendj-sdk-parent/pom.xml diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index ab7774c96..602f9bd3b 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -30,7 +30,7 @@ org.forgerock.opendj opendj-sdk-bom - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT org.forgerock.opendj diff --git a/pom.xml b/pom.xml index c8b17e4a0..697ff6c7a 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ org.forgerock.opendj opendj-sdk-bom - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT pom @@ -152,7 +152,7 @@ scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs - 3.0.0-SNAPSHOT + 4.0.0-SNAPSHOT 1.4.2 From ff50088816d51c162d23b7b78e3ec762d44c9433 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Fri, 18 Dec 2015 18:00:48 +0100 Subject: [PATCH 002/125] Switch SCM tag back to HEAD --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 697ff6c7a..88029f3f7 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ https://stash.forgerock.org/projects/OPENDJ/repos/opendj-sdk/browse scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git - release/3.0.0 + HEAD From 91e99521398d74e68d993d2bd106a712f01bed89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 21 Dec 2015 14:47:54 +0100 Subject: [PATCH 003/125] Converted try/finally Closeable.close() (or Utils.closeSilently()) into try-with-resources TemplateFile.java: In retrieveFirstAndLastNames(), fixed a bug. --- .../forgerock/opendj/cli/ArgumentParser.java | 19 ++- .../opendj/cli/ConnectionFactoryProvider.java | 6 +- .../opendj/cli/DocGenerationHelper.java | 7 +- .../opendj/cli/FileBasedArgument.java | 28 ++--- .../opendj/cli/PromptingTrustManager.java | 11 +- .../java/com/forgerock/opendj/cli/Utils.java | 15 +-- .../maven/CopyrightAbstractMojo.java | 10 +- .../forgerock/opendj/ldap/KeyManagers.java | 15 +-- .../forgerock/opendj/ldap/TrustManagers.java | 15 +-- .../opendj/ldif/AbstractLDIFReader.java | 12 +- .../java/org/forgerock/opendj/ldif/LDIF.java | 7 +- .../opendj/ldif/LDIFChangeRecordReader.java | 7 +- .../opendj/ldif/LDIFChangeRecordWriter.java | 7 +- .../opendj/ldif/LDIFEntryReader.java | 7 +- .../opendj/ldif/LDIFEntryWriter.java | 6 +- .../forgerock/opendj/ldif/TemplateFile.java | 25 +--- .../forgerock/opendj/ldif/TemplateTag.java | 39 ++---- .../forgerock/opendj/ldap/TestCaseUtils.java | 19 ++- .../ConnectionChangeRecordWriterTestCase.java | 118 ++++-------------- .../opendj/ldif/EntryGeneratorTestCase.java | 48 ++----- .../org/forgerock/opendj/maven/doc/Utils.java | 6 +- .../forgerock/opendj/examples/Controls.java | 16 +-- .../opendj/ldap/tools/DataSource.java | 10 +- 23 files changed, 108 insertions(+), 345 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java index 0e4fdf842..9ba847a4f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java @@ -54,7 +54,6 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.i18n.slf4j.LocalizedLogger; -import org.forgerock.util.Utils; /** * This class defines a utility that can be used to deal with command-line @@ -425,13 +424,13 @@ Properties checkExternalProperties() throws ArgumentException { } // We have a location for the properties file. - final Properties argumentProperties = new Properties(); - final String scriptName = getScriptName(); try { + final Properties argumentProperties = new Properties(); + final String scriptName = getScriptName(); final Properties p = new Properties(); - final FileInputStream fis = new FileInputStream(propertiesFilePath); - p.load(fis); - fis.close(); + try (final FileInputStream fis = new FileInputStream(propertiesFilePath)) { + p.load(fis); + } for (final Enumeration e = p.propertyNames(); e.hasMoreElements();) { final String currentPropertyName = (String) e.nextElement(); @@ -449,12 +448,12 @@ Properties checkExternalProperties() throws ArgumentException { argumentProperties.setProperty(propertyName.toLowerCase(), p .getProperty(currentPropertyName)); } + return argumentProperties; } catch (final Exception e) { final LocalizableMessage message = ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(propertiesFilePath, getExceptionMessage(e)); throw new ArgumentException(message, e); } - return argumentProperties; } /** @@ -1384,9 +1383,7 @@ public void parseArguments(final String[] rawArguments, final String propertiesF Properties argumentProperties = null; - FileInputStream fis = null; - try { - fis = new FileInputStream(propertiesFile); + try (final FileInputStream fis = new FileInputStream(propertiesFile)) { final Properties p = new Properties(); p.load(fis); argumentProperties = p; @@ -1396,8 +1393,6 @@ public void parseArguments(final String[] rawArguments, final String propertiesF ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE.get(propertiesFile, getExceptionMessage(e)); throw new ArgumentException(message, e); } - } finally { - Utils.closeSilently(fis); } parseArguments(rawArguments, argumentProperties); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index 1f21cb89c..bd3b890c2 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -733,10 +733,10 @@ public X509KeyManager getKeyManager(String keyStoreFile) throws KeyStoreExceptio keyStorePIN = keyStorePass.toCharArray(); } - final FileInputStream fos = new FileInputStream(keyStoreFile); final KeyStore keystore = KeyStore.getInstance(KeyStore.getDefaultType()); - keystore.load(fos, keyStorePIN); - fos.close(); + try (final FileInputStream fos = new FileInputStream(keyStoreFile)) { + keystore.load(fos, keyStorePIN); + } return new ApplicationKeyManager(keystore, keyStorePIN); } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java index a60d99aa1..ba6bf75ac 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java @@ -77,16 +77,13 @@ public static void applyTemplate(StringBuilder builder, final String template, f configuration = getConfiguration(); // FreeMarker takes the data and a Writer to process the template. - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - Writer writer = new OutputStreamWriter(outputStream); - try { + try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + Writer writer = new OutputStreamWriter(outputStream)) { Template configurationTemplate = configuration.getTemplate(template); configurationTemplate.process(map, writer); builder.append(outputStream.toString()); } catch (Exception e) { throw new RuntimeException(e.getMessage(), e); - } finally { - org.forgerock.util.Utils.closeSilently(writer, outputStream); } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java index fd96b583f..8d71a386f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java @@ -28,11 +28,12 @@ import static com.forgerock.opendj.cli.CliMessages.*; import static com.forgerock.opendj.util.StaticUtils.getExceptionMessage; -import static org.forgerock.util.Utils.closeSilently; import java.io.BufferedReader; import java.io.File; +import java.io.FileNotFoundException; import java.io.FileReader; +import java.io.IOException; import java.util.LinkedHashMap; import org.forgerock.i18n.LocalizableMessage; @@ -195,31 +196,20 @@ public boolean valueIsAcceptable(final String valueString, return false; } - // Open the file for reading. - BufferedReader reader; - try { - reader = new BufferedReader(new FileReader(valueFile)); - } catch (final Exception e) { - invalidReason.append(ERR_FILEARG_CANNOT_OPEN_FILE.get(valueString, getName(), - getExceptionMessage(e))); - return false; - } - - // Read the first line and close the file. + // Open the file, read the first line and close the file. String line; - try { + try (BufferedReader reader = new BufferedReader(new FileReader(valueFile))) { line = reader.readLine(); - } catch (final Exception e) { - invalidReason.append(ERR_FILEARG_CANNOT_READ_FILE.get(valueString, getName(), - getExceptionMessage(e))); + } catch (final FileNotFoundException e) { + invalidReason.append(ERR_FILEARG_CANNOT_OPEN_FILE.get(valueString, getName(), getExceptionMessage(e))); + return false; + } catch (final IOException e) { + invalidReason.append(ERR_FILEARG_CANNOT_READ_FILE.get(valueString, getName(), getExceptionMessage(e))); return false; - } finally { - closeSilently(reader); } // If the line read is null, then that means the file was empty. if (line == null) { - invalidReason.append(ERR_FILEARG_EMPTY_FILE.get(valueString, getName())); return false; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java index a7d4a7319..d90ea0298 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java @@ -152,11 +152,8 @@ public PromptingTrustManager(final ConsoleApplication app, final String accepted if (!onDiskTrustStorePath.exists()) { onDiskTrustStore.load(null, null); } else { - final FileInputStream fos = new FileInputStream(onDiskTrustStorePath); - try { + try (final FileInputStream fos = new FileInputStream(onDiskTrustStorePath)) { onDiskTrustStore.load(fos, DEFAULT_PASSWORD); - } finally { - fos.close(); } } final TrustManagerFactory tmf = @@ -295,9 +292,9 @@ private void acceptCertificate(final X509Certificate[] chain, final boolean perm if (!truststoreFile.exists()) { createFile(truststoreFile); } - final FileOutputStream fos = new FileOutputStream(truststoreFile); - onDiskTrustStore.store(fos, DEFAULT_PASSWORD); - fos.close(); + try (final FileOutputStream fos = new FileOutputStream(truststoreFile)) { + onDiskTrustStore.store(fos, DEFAULT_PASSWORD); + } } catch (final Exception e) { LOG.warn(LocalizableMessage.raw("Error saving store to disk: " + e)); } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java index 28cafe9dc..8131b6cee 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java @@ -161,13 +161,10 @@ public static int filterExitCode(final int exitCode) { * If a problem occurs while trying to read the specified file. */ public static byte[] readBytesFromFile(final String filePath) throws IOException { - byte[] val = null; - FileInputStream fis = null; - try { - final File file = new File(filePath); - fis = new FileInputStream(file); - final long length = file.length(); - val = new byte[(int) length]; + final File file = new File(filePath); + final long length = file.length(); + try (FileInputStream fis = new FileInputStream(file)) { + byte[] val = new byte[(int) length]; // Read in the bytes int offset = 0; int numRead = 0; @@ -182,10 +179,6 @@ public static byte[] readBytesFromFile(final String filePath) throws IOException } return val; - } finally { - if (fis != null) { - fis.close(); - } } } diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java index 54fd88488..932c81852 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java @@ -25,8 +25,6 @@ */ package org.forgerock.maven; -import static org.forgerock.util.Utils.closeSilently; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -304,11 +302,8 @@ private boolean fileNameEquals(String folderName, File file) { * Check to see whether the provided file has a comment line containing a * copyright without the current year. */ - @SuppressWarnings("resource") private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionException { - BufferedReader reader = null; - try { - reader = new BufferedReader(new FileReader(changedFile)); + try (BufferedReader reader = new BufferedReader(new FileReader(changedFile))) { String line; while ((line = reader.readLine()) != null) { String lowerLine = line.toLowerCase().trim(); @@ -316,7 +311,6 @@ private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionExce && lowerLine.contains("copyright") && line.contains(currentYear.toString()) && line.contains(copyrightOwnerToken)) { - reader.close(); return true; } } @@ -325,8 +319,6 @@ private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionExce } catch (IOException ioe) { throw new MojoExecutionException("Could not read file " + changedFile.getPath() + " to check copyright date. No further copyright date checking will be performed."); - } finally { - closeSilently(reader); } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java index 7504772ab..482f03eee 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -209,19 +209,8 @@ public static X509KeyManager useKeyStoreFile(final String file, final char[] pas final String keyStoreFormat = format != null ? format : KeyStore.getDefaultType(); final KeyStore keyStore = KeyStore.getInstance(keyStoreFormat); - - FileInputStream fos = null; - try { - fos = new FileInputStream(keyStoreFile); + try (FileInputStream fos = new FileInputStream(keyStoreFile)) { keyStore.load(fos, password); - } finally { - if (fos != null) { - try { - fos.close(); - } catch (final IOException ignored) { - // Ignore. - } - } } final KeyManagerFactory kmf = diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java index a2e2a8319..4791d7618 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -326,19 +326,8 @@ public static X509TrustManager checkUsingTrustStore(final String file, final cha final String trustStoreFormat = format != null ? format : KeyStore.getDefaultType(); final KeyStore keyStore = KeyStore.getInstance(trustStoreFormat); - - FileInputStream fos = null; - try { - fos = new FileInputStream(trustStoreFile); + try (FileInputStream fos = new FileInputStream(trustStoreFile)) { keyStore.load(fos, password); - } finally { - if (fos != null) { - try { - fos.close(); - } catch (final IOException ignored) { - // Ignore. - } - } } final TrustManagerFactory tmf = diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java index b431cab32..82070c977 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java @@ -288,11 +288,9 @@ final ByteString parseSingleValue(final LDIFRecord record, final String ldifLine throw DecodeException.error(message); } - InputStream inputStream = null; ByteStringBuilder builder = null; - try { + try (InputStream inputStream = contentURL.openConnection().getInputStream()) { builder = new ByteStringBuilder(); - inputStream = contentURL.openConnection().getInputStream(); int bytesRead; final byte[] buffer = new byte[4096]; @@ -310,14 +308,6 @@ final ByteString parseSingleValue(final LDIFRecord record, final String ldifLine ERR_LDIF_URL_IO_ERROR.get(entryDN.toString(), record.lineNumber, attrName, String.valueOf(contentURL), String.valueOf(e)); throw DecodeException.error(message); - } finally { - if (inputStream != null) { - try { - inputStream.close(); - } catch (final Exception e) { - // Ignore. - } - } } } else { /* diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java index 851c18ce2..af8bf1459 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java @@ -22,7 +22,6 @@ * * Copyright 2011-2015 ForgeRock AS */ - package org.forgerock.opendj.ldif; import static com.forgerock.opendj.ldap.CoreMessages.*; @@ -67,7 +66,6 @@ import org.forgerock.opendj.ldap.requests.SearchRequest; import org.forgerock.opendj.ldap.schema.AttributeUsage; import org.forgerock.opendj.ldap.schema.Schema; -import org.forgerock.util.Utils; /** * This class contains common utility methods for creating and manipulating @@ -321,8 +319,7 @@ public static Entry makeEntry(List ldifLines) { */ public static List makeEntries(String... ldifLines) { List entries = new ArrayList<>(); - LDIFEntryReader reader = new LDIFEntryReader(ldifLines); - try { + try (LDIFEntryReader reader = new LDIFEntryReader(ldifLines)) { while (reader.hasNext()) { entries.add(reader.readEntry()); } @@ -332,8 +329,6 @@ public static List makeEntries(String... ldifLines) { } catch (final IOException e) { // This should never happen for a String based reader. throw new LocalizedIllegalArgumentException(WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e.getMessage())); - } finally { - Utils.closeSilently(reader); } if (entries.isEmpty()) { throw new LocalizedIllegalArgumentException(WARN_READ_LDIF_ENTRY_NO_ENTRY_FOUND.get()); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java index 5218abbc4..c89b0ccf6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java @@ -24,7 +24,6 @@ * Copyright 2009-2010 Sun Microsystems, Inc. * Portions copyright 2011-2015 ForgeRock AS */ - package org.forgerock.opendj.ldif; import java.io.IOException; @@ -61,7 +60,6 @@ import org.forgerock.opendj.ldap.schema.Syntax; import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException; import org.forgerock.util.Reject; -import org.forgerock.util.Utils; import static com.forgerock.opendj.ldap.CoreMessages.*; import static com.forgerock.opendj.util.StaticUtils.*; @@ -114,8 +112,7 @@ public final class LDIFChangeRecordReader extends AbstractLDIFReader implements */ public static ChangeRecord valueOfLDIFChangeRecord(final String... ldifLines) { // LDIF change record reader is tolerant to missing change types. - final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(ldifLines); - try { + try (final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(ldifLines)) { if (!reader.hasNext()) { // No change record found. final LocalizableMessage message = @@ -141,8 +138,6 @@ public static ChangeRecord valueOfLDIFChangeRecord(final String... ldifLines) { final LocalizableMessage message = WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e.getMessage()); throw new LocalizedIllegalArgumentException(message); - } finally { - Utils.closeSilently(reader); } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java index 84e1639ac..84d591697 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -82,9 +82,8 @@ public final class LDIFChangeRecordWriter extends AbstractLDIFWriter implements */ public static String toString(final ChangeRecord change) { final StringWriter writer = new StringWriter(128); - try { - new LDIFChangeRecordWriter(writer).setAddUserFriendlyComments(true).writeChangeRecord( - change).close(); + try (LDIFChangeRecordWriter ldifWriter = new LDIFChangeRecordWriter(writer)) { + ldifWriter.setAddUserFriendlyComments(true).writeChangeRecord(change); } catch (final IOException e) { // Should never happen. throw new IllegalStateException(e); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java index fade05eda..1508aea05 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java @@ -24,7 +24,6 @@ * Copyright 2009-2010 Sun Microsystems, Inc. * Portions copyright 2011-2015 ForgeRock AS */ - package org.forgerock.opendj.ldif; import static com.forgerock.opendj.ldap.CoreMessages.*; @@ -48,7 +47,6 @@ import org.forgerock.opendj.ldap.schema.Schema; import org.forgerock.opendj.ldap.schema.SchemaValidationPolicy; import org.forgerock.util.Reject; -import org.forgerock.util.Utils; /** * An LDIF entry reader reads attribute value records (entries) using the LDAP @@ -75,8 +73,7 @@ public final class LDIFEntryReader extends AbstractLDIFReader implements EntryRe * If {@code ldifLines} was {@code null}. */ public static Entry valueOfLDIFEntry(final String... ldifLines) { - final LDIFEntryReader reader = new LDIFEntryReader(ldifLines); - try { + try (final LDIFEntryReader reader = new LDIFEntryReader(ldifLines)) { if (!reader.hasNext()) { // No change record found. final LocalizableMessage message = @@ -102,8 +99,6 @@ public static Entry valueOfLDIFEntry(final String... ldifLines) { final LocalizableMessage message = WARN_READ_LDIF_RECORD_UNEXPECTED_IO_ERROR.get(e.getMessage()); throw new LocalizedIllegalArgumentException(message); - } finally { - Utils.closeSilently(reader); } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java index f64c8a426..0aa8d50f2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -60,8 +60,8 @@ public final class LDIFEntryWriter extends AbstractLDIFWriter implements EntryWr */ public static String toString(final Entry entry) { final StringWriter writer = new StringWriter(128); - try { - new LDIFEntryWriter(writer).setAddUserFriendlyComments(true).writeEntry(entry).close(); + try (LDIFEntryWriter ldifWriter = new LDIFEntryWriter(writer)) { + ldifWriter.setAddUserFriendlyComments(true).writeEntry(entry); } catch (final IOException e) { // Should never happen. throw new IllegalStateException(e); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java index a56bcff62..aa2c92b62 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java @@ -81,7 +81,6 @@ import org.forgerock.opendj.ldif.TemplateTag.UnderscoreParentDNTag; import org.forgerock.util.Pair; import org.forgerock.util.Reject; -import org.forgerock.util.Utils; /** * A template file allow to generate entries from a collection of constant @@ -250,28 +249,20 @@ Random getRandom() { } private void retrieveFirstAndLastNames() throws IOException { - BufferedReader first = null; - try { - first = getReader(FIRST_NAME_FILE); + try (BufferedReader first = getReader(FIRST_NAME_FILE)) { if (first == null) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_COULD_NOT_FIND_NAME_FILE.get(FIRST_NAME_FILE)); } final List names = readLines(first); firstNames = names.toArray(new String[names.size()]); - } finally { - Utils.closeSilently(first); } - BufferedReader last = null; - try { - last = getReader(LAST_NAME_FILE); + try (BufferedReader last = getReader(LAST_NAME_FILE)) { if (last == null) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_COULD_NOT_FIND_NAME_FILE.get(LAST_NAME_FILE)); } final List names = readLines(last); lastNames = names.toArray(new String[names.size()]); - } finally { - Utils.closeSilently(first); } } @@ -362,9 +353,7 @@ void parse(List warnings) throws IOException, DecodeExceptio * If any other problem occurs while parsing the template file. */ void parse(String templateFilename, List warnings) throws IOException, DecodeException { - BufferedReader templateReader = null; - try { - templateReader = getReader(templateFilename); + try (BufferedReader templateReader = getReader(templateFilename)) { if (templateReader == null) { throw DecodeException.fatalError( ERR_ENTRY_GENERATOR_COULD_NOT_FIND_TEMPLATE_FILE.get(templateFilename)); @@ -379,8 +368,6 @@ void parse(String templateFilename, List warnings) throws IO final List fileLines = readLines(templateReader); final String[] lines = fileLines.toArray(new String[fileLines.size()]); parse(lines, warnings); - } finally { - Utils.closeSilently(templateReader); } } @@ -399,14 +386,10 @@ void parse(String templateFilename, List warnings) throws IO * If any other problem occurs while parsing the template. */ void parse(InputStream inputStream, List warnings) throws IOException, DecodeException { - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(inputStream)); + try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) { final List fileLines = readLines(reader); final String[] lines = fileLines.toArray(new String[fileLines.size()]); parse(lines, warnings); - } finally { - Utils.closeSilently(reader); } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java index 4f3a61cf7..5230928d5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2013 ForgeRock AS + * Portions Copyright 2013-2015 ForgeRock AS */ package org.forgerock.opendj.ldif; @@ -44,7 +44,6 @@ import org.forgerock.opendj.ldif.TemplateFile.Template; import org.forgerock.opendj.ldif.TemplateFile.TemplateEntry; import org.forgerock.opendj.ldif.TemplateFile.TemplateValue; -import org.forgerock.util.Utils; /** * Represents a tag that may be used in a template line when generating entries. @@ -395,31 +394,21 @@ private void initialize(TemplateFile templateFile, String[] arguments, int lineN // The first argument should be the path to the file. final String filePath = arguments[0]; - BufferedReader dataReader = null; - try { - dataReader = templateFile.getReader(filePath); + try (BufferedReader dataReader = templateFile.getReader(filePath)) { if (dataReader == null) { - LocalizableMessage message = ERR_ENTRY_GENERATOR_TAG_CANNOT_FIND_FILE.get(filePath, getName(), - lineNumber); - throw DecodeException.fatalError(message); + throw DecodeException.fatalError( + ERR_ENTRY_GENERATOR_TAG_CANNOT_FIND_FILE.get(filePath, getName(), lineNumber)); } - // See if the file has already been read into memory. If not, then - // read it. - try { - fileLines = templateFile.getLines(filePath, dataReader); - } catch (IOException ioe) { - LocalizableMessage message = ERR_ENTRY_GENERATOR_TAG_CANNOT_READ_FILE.get(filePath, getName(), - lineNumber, String.valueOf(ioe)); - throw DecodeException.fatalError(message, ioe); - } - } finally { - Utils.closeSilently(dataReader); + // See if the file has already been read into memory. If not, then read it. + fileLines = templateFile.getLines(filePath, dataReader); + } catch (IOException e) { + throw DecodeException.fatalError( + ERR_ENTRY_GENERATOR_TAG_CANNOT_READ_FILE.get(filePath, getName(), lineNumber, e), e); } - // If there is a second argument, then it should be either - // "sequential" or "random". If there isn't one, then we should - // assume "random". + // If there is a second argument, then it should be either "sequential" or "random". + // If there isn't one, then we should assume "random". if (arguments.length == 2) { if ("sequential".equalsIgnoreCase(arguments[1])) { isSequential = true; @@ -854,11 +843,7 @@ private void initialize(TemplateFile templateFile, String[] arguments, int lineN @Override TagResult generateValue(TemplateEntry templateEntry, TemplateValue templateValue) { int intValue = random.nextInt(100); - if (intValue < percentage) { - return TagResult.SUCCESS; - } else { - return TagResult.FAILURE; - } + return intValue < percentage ? TagResult.SUCCESS : TagResult.FAILURE; } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java index 5cce402c0..a6646aa26 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -31,7 +31,6 @@ import java.io.IOException; import java.net.InetSocketAddress; import java.net.ServerSocket; -import java.net.SocketAddress; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -66,13 +65,12 @@ public static String createTempFile(final String... lines) throws Exception { final File f = File.createTempFile("LDIFBasedTestCase", ".txt"); f.deleteOnExit(); - final FileWriter w = new FileWriter(f); - for (final String s : lines) { - w.write(s + System.getProperty("line.separator")); + try (final FileWriter w = new FileWriter(f)) { + for (final String s : lines) { + w.write(s + System.getProperty("line.separator")); + } } - w.close(); - return f.getAbsolutePath(); } @@ -101,13 +99,10 @@ public static String getTestFilePath(String relativePathFromClasspath) throws Ex * @return The free port. */ public static InetSocketAddress findFreeSocketAddress() { - try { - ServerSocket serverLdapSocket = new ServerSocket(); + try (ServerSocket serverLdapSocket = new ServerSocket()) { serverLdapSocket.setReuseAddress(true); serverLdapSocket.bind(new InetSocketAddress("127.0.0.1", 0)); - final SocketAddress address = serverLdapSocket.getLocalSocketAddress(); - serverLdapSocket.close(); - return (InetSocketAddress) address; + return (InetSocketAddress) serverLdapSocket.getLocalSocketAddress(); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java index 914111cda..5b9030293 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -88,14 +88,9 @@ public final String[] getStandardLDIFChangeRecord() { @Test public final void testWriteChangeRecordAddRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord(Requests.newAddRequest(getStandardLDIFChangeRecord())); verify(connection, times(1)).add(any(AddRequest.class)); - } finally { - writer.close(); } } @@ -107,12 +102,8 @@ public final void testWriteChangeRecordAddRequest() throws Exception { @Test(expectedExceptions = NullPointerException.class) public final void testWriteChangeRecordAddRequestDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord((AddRequest) null); - } finally { - writer.close(); } } @@ -125,15 +116,10 @@ public final void testWriteChangeRecordAddRequestDoesntAllowNull() throws Except @Test public final void testWriteChangeRecordContainingAddRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord(Requests.newChangeRecord(getStandardLDIFChangeRecord())); Assert.assertTrue(Requests.newChangeRecord(getStandardLDIFChangeRecord()) instanceof AddRequest); verify(connection, times(1)).add(any(AddRequest.class)); - } finally { - writer.close(); } } @@ -146,10 +132,7 @@ public final void testWriteChangeRecordContainingAddRequest() throws Exception { @Test public final void testWriteChangeRecordContainingDeleteRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { // @formatter:off ChangeRecord cr = Requests.newChangeRecord( "dn: dc=example,dc=com", @@ -159,8 +142,6 @@ public final void testWriteChangeRecordContainingDeleteRequest() throws Exceptio // @formatter:on Assert.assertTrue(cr instanceof DeleteRequest); verify(connection, times(1)).delete(any(DeleteRequest.class)); - } finally { - writer.close(); } } @@ -172,10 +153,7 @@ public final void testWriteChangeRecordContainingDeleteRequest() throws Exceptio @Test(expectedExceptions = LocalizedIllegalArgumentException.class) public final void testWriteChangeRecordDoesntAllowMultipleLDIF() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { // @formatter:off writer.writeChangeRecord(Requests.newChangeRecord( "dn: uid=scarter,ou=People,dc=example,dc=com", @@ -189,9 +167,6 @@ public final void testWriteChangeRecordDoesntAllowMultipleLDIF() throws Exceptio "sn: Amarr") ); // @formatter:on - - } finally { - writer.close(); } } @@ -205,7 +180,6 @@ public final void testWriteChangeRecordDoesntAllowMultipleLDIF() throws Exceptio @Test(expectedExceptions = RuntimeException.class) public final void testWriteChangeRecordChangeAcceptSendIOException() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; ChangeRecord cr = mock(ChangeRecord.class); when(cr.accept(any(ChangeRecordVisitor.class), any(ConnectionChangeRecordWriter.class))) @@ -222,11 +196,8 @@ public IOException answer(final InvocationOnMock invocation) throws Throwable { } }); - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord(cr); - } finally { - writer.close(); } } @@ -240,7 +211,6 @@ public IOException answer(final InvocationOnMock invocation) throws Throwable { @Test(expectedExceptions = LdapException.class) public final void testWriteChangeRecordChangeAcceptSendLdapException() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; ChangeRecord cr = mock(ChangeRecord.class); when(cr.accept(any(ChangeRecordVisitor.class), any(ConnectionChangeRecordWriter.class))) @@ -257,11 +227,8 @@ public LdapException answer(final InvocationOnMock invocation) throws Throwable } }); - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord(cr); - } finally { - writer.close(); } } @@ -273,12 +240,8 @@ public LdapException answer(final InvocationOnMock invocation) throws Throwable @Test(expectedExceptions = NullPointerException.class) public final void testWriteChangeRecordChangeRecordDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord((ChangeRecord) null); - } finally { - writer.close(); } } @@ -290,15 +253,11 @@ public final void testWriteChangeRecordChangeRecordDoesntAllowNull() throws Exce @Test public final void testWriteChangeRecordDeleteRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { ChangeRecord cr = Requests.newDeleteRequest(DN.valueOf("cn=scarter,dc=example,dc=com")); - writer = new ConnectionChangeRecordWriter(connection); writer.writeChangeRecord(cr); verify(connection, times(1)).delete(any(DeleteRequest.class)); - } finally { - writer.close(); } } @@ -310,12 +269,8 @@ public final void testWriteChangeRecordDeleteRequest() throws Exception { @Test(expectedExceptions = NullPointerException.class) public final void testWriteChangeRecordDeleteRequestDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord((DeleteRequest) null); - } finally { - writer.close(); } } @@ -327,19 +282,15 @@ public final void testWriteChangeRecordDeleteRequestDoesntAllowNull() throws Exc @Test public final void testWriteChangeRecordModifyDNRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { // @formatter:off ChangeRecord cr = Requests.newModifyDNRequest( "cn=scarter,dc=example,dc=com", "cn=Susan Jacobs"); //@formatter:on - writer = new ConnectionChangeRecordWriter(connection); writer.writeChangeRecord(cr); verify(connection, times(1)).modifyDN(any(ModifyDNRequest.class)); - } finally { - writer.close(); } } @@ -351,12 +302,8 @@ public final void testWriteChangeRecordModifyDNRequest() throws Exception { @Test(expectedExceptions = NullPointerException.class) public final void testWriteChangeRecordModifyDNRequestDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord((ModifyDNRequest) null); - } finally { - writer.close(); } } @@ -368,10 +315,7 @@ public final void testWriteChangeRecordModifyDNRequestDoesntAllowNull() throws E @Test public final void testWriteChangeRecordModifyRequest() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { // @formatter:off ChangeRecord cr = Requests.newModifyRequest( "dn: cn=Fiona Jensen, ou=Marketing, dc=airius, dc=com", @@ -382,8 +326,6 @@ public final void testWriteChangeRecordModifyRequest() throws Exception { writer.writeChangeRecord(cr); // @formatter:on verify(connection, times(1)).modify(any(ModifyRequest.class)); - } finally { - writer.close(); } } @@ -395,12 +337,8 @@ public final void testWriteChangeRecordModifyRequest() throws Exception { @Test(expectedExceptions = NullPointerException.class) public final void testWriteChangeRecordModifyRequestDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeChangeRecord((ModifyRequest) null); - } finally { - writer.close(); } } @@ -413,17 +351,12 @@ public final void testWriteChangeRecordModifyRequestDoesntAllowNull() throws Exc @Test public final void testWriteCommentDoNotSupportComment() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeComment("# A new comment"); verify(connection, Mockito.never()).add(any(String.class)); verify(connection, Mockito.never()).delete(any(String.class)); verify(connection, Mockito.never()).modify(any(String.class)); verify(connection, Mockito.never()).modifyDN(any(String.class), any(String.class)); - } finally { - writer.close(); } } @@ -435,12 +368,8 @@ public final void testWriteCommentDoNotSupportComment() throws Exception { @Test(expectedExceptions = NullPointerException.class) public final void testWriteCommentDoesntAllowNull() throws Exception { final Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { writer.writeComment(null); - } finally { - writer.close(); } } @@ -451,11 +380,8 @@ public final void testWriteCommentDoesntAllowNull() throws Exception { */ @Test(expectedExceptions = NullPointerException.class) public final void testConnectionChangeRecordWriterDoesntAllowNull() throws Exception { - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(null); - } finally { - writer.close(); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(null)) { + // nothing more to do } } @@ -468,11 +394,9 @@ public final void testConnectionChangeRecordWriterDoesntAllowNull() throws Excep @Test public final void testConnectionChangeRecordWriterClose() throws Exception { Connection connection = mock(Connection.class); - ConnectionChangeRecordWriter writer = null; - try { - writer = new ConnectionChangeRecordWriter(connection); + try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { + // nothing more to do } finally { - writer.close(); verify(connection, times(1)).close(); } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java index 504cade5c..cfa7e2a94 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java @@ -26,8 +26,9 @@ package org.forgerock.opendj.ldif; import static com.forgerock.opendj.ldap.CoreMessages.*; + import static org.fest.assertions.Assertions.*; -import static org.forgerock.opendj.ldap.TestCaseUtils.getTestFilePath; +import static org.forgerock.opendj.ldap.TestCaseUtils.*; import static org.forgerock.opendj.ldap.schema.CoreSchema.*; import java.io.File; @@ -74,52 +75,35 @@ public void setUp() throws Exception { @Test(enabled = false) public void printEntriesToStdOut() throws Exception { String path = SUBTEMPLATES_TEMPLATE_PATH; - EntryGenerator generator = null; - try { - generator = new EntryGenerator(getTestFilePath(path)).setResourcePath(resourcePath); + try (EntryGenerator generator = new EntryGenerator(getTestFilePath(path)).setResourcePath(resourcePath)) { while (generator.hasNext()) { System.out.println(generator.readEntry()); } - } finally { - Utils.closeSilently(generator); } - } @Test public void testCreateWithDefaultTemplateFile() throws Exception { - EntryGenerator generator = null; - try { - generator = new EntryGenerator(); + try (EntryGenerator generator = new EntryGenerator()) { assertThat(generator.hasNext()).isTrue(); - } finally { - Utils.closeSilently(generator); } } @Test(expectedExceptions = DecodeException.class, expectedExceptionsMessageRegExp = ".*Could not find template file unknown.*") public void testCreateWithMissingTemplateFile() throws Exception { - EntryGenerator generator = null; - try { - generator = new EntryGenerator("unknown/path"); + try (EntryGenerator generator = new EntryGenerator("unknown/path")) { generator.hasNext(); - } finally { - Utils.closeSilently(generator); } } @Test public void testCreateWithSetConstants() throws Exception { - EntryGenerator generator = null; - try { - generator = new EntryGenerator().setConstant("numusers", 1); + try (EntryGenerator generator = new EntryGenerator().setConstant("numusers", 1)) { generator.readEntry(); generator.readEntry(); assertThat(generator.readEntry().getName().toString()).isEqualTo("uid=user.0,ou=People,dc=example,dc=com"); assertThat(generator.hasNext()).as("should have no more entries").isFalse(); - } finally { - Utils.closeSilently(generator); } } @@ -272,15 +256,15 @@ private void checkEntryObjectClasses(Entry entry, String...objectClasses) { Attribute ocAttribute = entry.getAttribute(getObjectClassAttributeType().getNameOrOID()); assertThat(ocAttribute).isNotNull(); Iterator it = ocAttribute.iterator(); - for (int i = 0; i < objectClasses.length; i++) { - assertThat(it.next().toString()).isEqualTo(objectClasses[i]); + for (String objectClass : objectClasses) { + assertThat(it.next().toString()).isEqualTo(objectClass); } assertThat(it.hasNext()).isFalse(); } private void checkPresenceOfAttributes(Entry entry, String... attributes) { - for (int i = 0; i < attributes.length; i++) { - assertThat(entry.getAttribute(attributes[i])).isNotNull(); + for (String attribute : attributes) { + assertThat(entry.getAttribute(attribute)).isNotNull(); } } @@ -576,17 +560,13 @@ public Object[][] createTemplatesToTestSpecialChars() { @Test(dataProvider = "templatesToTestEscapeChars", dependsOnMethods = { "testParsingEscapeCharInTemplate" }) public void testEscapeCharsFromTemplate(String testName, String[] lines, String attrName, String expectedValue) throws Exception { - EntryGenerator generator = null; - try { - generator = new EntryGenerator(lines).setResourcePath(resourcePath); + try (EntryGenerator generator = new EntryGenerator(lines).setResourcePath(resourcePath)) { Entry topEntry = generator.readEntry(); Entry entry = generator.readEntry(); assertThat(topEntry).isNotNull(); assertThat(entry).isNotNull(); assertThat(entry.getAttribute(attrName).firstValueAsString()).isEqualTo(expectedValue); - } finally { - Utils.closeSilently(generator); } } @@ -609,17 +589,13 @@ public void testCombineEscapeCharInTemplate() throws Exception { // from [A-Z]. "cn: Foo \\<\\>\\{1\\}{sn}", "" }; - EntryGenerator generator = null; - try { - generator = new EntryGenerator(lines).setResourcePath(resourcePath); + try (EntryGenerator generator = new EntryGenerator(lines).setResourcePath(resourcePath)) { Entry topEntry = generator.readEntry(); Entry entry = generator.readEntry(); assertThat(topEntry).isNotNull(); assertThat(entry).isNotNull(); assertThat(entry.getAttribute("cn").firstValueAsString()).matches("Foo <[A-Z]>\\{1\\}Bar"); - } finally { - Utils.closeSilently(generator); } } } diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java index 7db7c5ffc..66e72844b 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java @@ -124,9 +124,9 @@ static void copyInputStreamToFile(InputStream original, File copy) throws IOExce */ static void writeStringToFile(final String string, final File file) throws IOException { createFile(file); - PrintWriter printWriter = new PrintWriter(file); - printWriter.print(string); - printWriter.close(); + try (PrintWriter printWriter = new PrintWriter(file)) { + printWriter.print(string); + } } /** diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java index 4aaf8d1e9..606608595 100644 --- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java +++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Controls.java @@ -112,9 +112,7 @@ public static void main(final String[] args) { final int port = Integer.parseInt(args[1]); final LDAPConnectionFactory factory = new LDAPConnectionFactory(host, port); - Connection connection = null; - try { - connection = factory.getConnection(); + try (Connection connection = factory.getConnection()) { checkSupportedControls(connection); final String user = "cn=Directory Manager"; @@ -149,10 +147,6 @@ public static void main(final String[] args) { System.err.println(e.getMessage()); System.exit(e.getResult().getResultCode().intValue()); return; - } finally { - if (connection != null) { - connection.close(); - } } } @@ -265,10 +259,8 @@ static void useAssertionControl(Connection connection) throws LdapException { connection.modify(request); - final LDIFEntryWriter writer = new LDIFEntryWriter(System.out); - try { + try (final LDIFEntryWriter writer = new LDIFEntryWriter(System.out)) { writer.writeEntry(connection.readEntry(dn, "description")); - writer.close(); } catch (final IOException e) { System.err.println(e.getMessage()); System.exit(ResultCode.CLIENT_SIDE_LOCAL_ERROR.intValue()); @@ -341,15 +333,13 @@ static void useGetEffectiveRightsRequestControl(Connection connection) throws Ld true, authDN, "cn")); final ConnectionEntryReader reader = connection.search(request); - final LDIFEntryWriter writer = new LDIFEntryWriter(System.out); - try { + try (final LDIFEntryWriter writer = new LDIFEntryWriter(System.out)) { while (reader.hasNext()) { if (!reader.isReference()) { final SearchResultEntry entry = reader.readEntry(); writer.writeEntry(entry); } } - writer.close(); } catch (final LdapException e) { System.err.println(e.getMessage()); System.exit(e.getResult().getResultCode().intValue()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java index 46f2455b3..1aea651ba 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java @@ -59,14 +59,11 @@ private static class IncrementLineFileDataSource implements IDataSource { public IncrementLineFileDataSource(final String file) throws IOException { lines = new ArrayList<>(); - final BufferedReader in = new BufferedReader(new FileReader(file)); - try { + try (final BufferedReader in = new BufferedReader(new FileReader(file))) { String line; while ((line = in.readLine()) != null) { lines.add(line); } - } finally { - in.close(); } } @@ -127,14 +124,11 @@ private static class RandomLineFileDataSource implements IDataSource { public RandomLineFileDataSource(final long seed, final String file) throws IOException { lines = new ArrayList<>(); random = new Random(seed); - final BufferedReader in = new BufferedReader(new FileReader(file)); - try { + try (final BufferedReader in = new BufferedReader(new FileReader(file))) { String line; while ((line = in.readLine()) != null) { lines.add(line); } - } finally { - in.close(); } } From 64648001ab28de9fa65d62df16a4d0673ed230ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 21 Dec 2015 15:50:53 +0100 Subject: [PATCH 004/125] Remove unused import --- .../java/org/forgerock/opendj/ldap/LDAPListener.java | 11 ++--------- .../opendj/ldap/schema/AbstractMatchingRuleImpl.java | 9 ++++----- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java index 061fc90e5..a7d9b8d37 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java @@ -24,11 +24,8 @@ * Copyright 2009-2010 Sun Microsystems, Inc. * Portions copyright 2012-2015 ForgeRock AS. */ - package org.forgerock.opendj.ldap; -import static com.forgerock.opendj.util.StaticUtils.*; - import java.io.Closeable; import java.io.IOException; import java.net.InetAddress; @@ -115,9 +112,7 @@ public final class LDAPListener extends CommonLDAPOptions implements Closeable { */ private final LDAPListenerImpl impl; - /** - * Transport provider that provides the implementation of this listener. - */ + /** Transport provider that provides the implementation of this listener. */ private TransportProvider provider; /** @@ -262,9 +257,7 @@ public LDAPListener(final String host, final int port, this.impl = provider.getLDAPListener(address, factory, options); } - /** - * Closes this LDAP connection listener. - */ + /** Closes this LDAP connection listener. */ @Override public void close() { impl.close(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java index f001f9210..c6428d894 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java @@ -26,6 +26,8 @@ */ package org.forgerock.opendj.ldap.schema; +import static org.forgerock.opendj.ldap.Assertion.*; + import java.util.Collection; import java.util.List; @@ -37,9 +39,6 @@ import org.forgerock.opendj.ldap.spi.IndexQueryFactory; import org.forgerock.opendj.ldap.spi.Indexer; -import static org.forgerock.opendj.ldap.Assertion.*; -import static com.forgerock.opendj.util.StaticUtils.*; - /** * This class implements a default equality or approximate matching rule that * matches normalized values in byte order. @@ -51,7 +50,7 @@ static DefaultAssertion named(final String indexID, final ByteSequence normalize } private static final class DefaultAssertion implements Assertion { - /** The ID of the DB index to use with this assertion.*/ + /** The ID of the DB index to use with this assertion. */ private final String indexID; private final ByteSequence normalizedAssertionValue; @@ -72,7 +71,7 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti } final class DefaultIndexer implements Indexer { - /** The ID of the DB index to use with this indexer.*/ + /** The ID of the DB index to use with this indexer. */ private final String indexID; DefaultIndexer(String indexID) { From 66873d220e8bf45f97e6bb95f02df10fc7ff9450 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 4 Jan 2016 17:53:33 +0100 Subject: [PATCH 005/125] OPENDJ-2589 Code cleanup Reformat sdk toolkit descriptor Move some descriptor informations in the toolkit pom.xml --- opendj-ldap-toolkit/pom.xml | 5 +- .../src/main/assembly/descriptor.xml | 174 +++++++++--------- 2 files changed, 93 insertions(+), 86 deletions(-) diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index 0e41b7f79..0e7e938cb 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -21,7 +21,7 @@ ! ! CDDL HEADER END ! - ! Copyright 2011-2015 ForgeRock AS. + ! Copyright 2011-2016 ForgeRock AS. ! --> @@ -138,6 +138,9 @@ src/main/assembly/descriptor.xml + + zip + diff --git a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml index 0fb1e5236..439c23ba1 100644 --- a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml +++ b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml @@ -21,94 +21,98 @@ ! ! CDDL HEADER END ! - ! Copyright 2011-2015 ForgeRock AS + ! Copyright 2011-2016 ForgeRock AS ! --> - opendj-ldap-toolkit - - zip - - - - ${project.basedir} - - 755 - 644 - - README - LICENSE - NOTICE - - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 + http://maven.apache.org/xsd/assembly-1.1.2.xsd"> + opendj-ldap-toolkit - - - ${basedir}/../legal-notices - legal-notices - 0755 - 0644 - - CDDLv1_0.txt - - + + + lib + 0755 + 0644 + + - - - ${basedir}/legal-notices - legal-notices - 0755 - 0644 - - THIRDPARTYREADME.txt - - - - ${project.parent.parent.basedir} - - 755 - 644 - - *.png - - - - src/main/assembly/bin - bin - 0755 - 0755 - unix - - - src/main/assembly/bat - bat - 0755 - 0644 - dos - - - src/main/assembly/libbin - lib - 0755 - 0755 - unix - - - src/main/assembly/libbat - lib - 0755 - 0644 - dos - - - - - lib - 0755 - 0644 - - + + + ${project.basedir} + + 755 + 644 + + README + LICENSE + NOTICE + + + + + + ${basedir}/../legal-notices + legal-notices + 0755 + 0644 + + CDDLv1_0.txt + + + + + + ${basedir}/legal-notices + legal-notices + 0755 + 0644 + + THIRDPARTYREADME.txt + + + + + ${project.parent.parent.basedir} + + 755 + 644 + + *.png + + + + + src/main/assembly/bin + bin + 0755 + 0755 + unix + + + + src/main/assembly/bat + bat + 0755 + 0644 + dos + + + + src/main/assembly/libbin + lib + 0755 + 0755 + unix + + + + src/main/assembly/libbat + lib + 0755 + 0644 + dos + + From ede3cb58200652515feb910287626e88d27dce3d Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 4 Jan 2016 18:00:30 +0100 Subject: [PATCH 006/125] OPENDJ-2589 Fix sdk toolkit extract folder name Remove maven version from the sdk toolkit extract folder. --- opendj-ldap-toolkit/src/main/assembly/descriptor.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml index 439c23ba1..212b94566 100644 --- a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml +++ b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml @@ -30,6 +30,8 @@ http://maven.apache.org/xsd/assembly-1.1.2.xsd"> opendj-ldap-toolkit + ${project.artifactId} + lib From 54e3c2b7da3ce0f51f4a279b140792c45c5384ff Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 5 Jan 2016 17:13:08 +0100 Subject: [PATCH 007/125] Fix copyright maven plugin The copyright maven was broken with files which were not commited. This is a regression introduced by 84e18a7. --- .../java/org/forgerock/maven/CopyrightAbstractMojo.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java index 932c81852..878ead46e 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; @@ -246,11 +246,13 @@ private void addToChangedFiles( final List scmChangedFiles, final String rootPath, final List changedFiles) { for (final ScmFile scmFile : scmChangedFiles) { final String scmFilePath = scmFile.getPath(); + final File file = new File(rootPath, scmFilePath); + if (scmFile.getStatus() != ScmFileStatus.UNKNOWN - && new File(scmFilePath).exists() + && file.exists() && !changedFiles.contains(scmFilePath) && !fileIsDisabled(scmFilePath)) { - changedFiles.add(new File(rootPath, scmFilePath)); + changedFiles.add(file); } } } From 18e25bd350068dc2eb6d16ecd76e3bae373c5a3e Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 4 Jan 2016 15:28:38 +0100 Subject: [PATCH 008/125] OPENDJ-2594 Remove unused field in authrate The invalidCredRecentCount counter was maintained but not used anywhere since commit 6e1f91e. --- .../forgerock/opendj/ldap/tools/AuthRate.java | 22 ++----------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java index 515633567..eb3816db3 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; @@ -36,7 +36,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import org.forgerock.i18n.LocalizableMessage; @@ -86,7 +85,6 @@ private BindStatsThread(final boolean extraFieldRequired) { @Override String[] getAdditionalColumns() { - invalidCredRecentCount.set(0); if (extraColumn.length != 0) { final long searchWaitTimeNs = searchWaitRecentTimeNs.getAndSet(0); extraColumn[0] = getDivisionResult( @@ -96,21 +94,6 @@ String[] getAdditionalColumns() { } } - private final class BindUpdateStatsResultHandler extends UpdateStatsResultHandler { - private BindUpdateStatsResultHandler(final long startTime) { - super(startTime); - } - - @Override - public void handleException(final LdapException exception) { - super.handleException(exception); - - if (exception.getResult().getResultCode() == ResultCode.INVALID_CREDENTIALS) { - invalidCredRecentCount.getAndIncrement(); - } - } - } - private final class BindWorkerThread extends WorkerThread { private SearchRequest sr; private BindRequest br; @@ -176,7 +159,7 @@ public Promise apply(SearchResultEntry result) incrementIterationCount(); return returnedPromise.thenOnResult(new UpdateStatsResultHandler(startTime)) - .thenOnException(new BindUpdateStatsResultHandler(startTime)); + .thenOnException(new UpdateStatsResultHandler(startTime)); } private Promise performBind(final Connection connection, @@ -306,7 +289,6 @@ private Promise performBind(final Connection connecti } private final AtomicLong searchWaitRecentTimeNs = new AtomicLong(); - private final AtomicInteger invalidCredRecentCount = new AtomicInteger(); private String filter; private String baseDN; private SearchScope scope; From d03b670ab9aa06fb6968f9e34c534697f85ae4a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Thu, 31 Dec 2015 11:51:16 +0100 Subject: [PATCH 009/125] Fix Eclipse warnings --- .../forgerock/maven/UpdateCopyrightMojo.java | 9 ++-- .../GetConnectionIDExtendedRequest.java | 49 +++++++++---------- .../opendj/ldap/CommonLDAPOptions.java | 10 +--- .../requests/AbstractUnmodifiableRequest.java | 34 ++++++------- .../forgerock/opendj/ldap/schema/Schema.java | 11 ++--- .../opendj/ldap/spi/LdapPromiseWrapper.java | 10 ++-- .../ldap/ByteStringBuilderTestCase.java | 10 ++-- .../opendj/ldap/ByteStringTestCase.java | 8 +-- .../HeartBeatConnectionFactoryTestCase.java | 5 +- 9 files changed, 65 insertions(+), 81 deletions(-) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java index d5ada2583..0c8d61fa8 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java @@ -20,7 +20,7 @@ * * CDDL HEADER END * - * Copyright 2015 ForgeRock AS + * Copyright 2016 ForgeRock AS */ package org.forgerock.maven; @@ -308,11 +308,10 @@ private String getNewCommentedLine() throws Exception { linePattern = bufferedLines.get(indexCommentToken++); commentToken = getCommentTokenInBlock(linePattern); } - if (commentToken != null) { - return linePattern.substring(0, linePattern.indexOf(commentToken) + 1); - } else { - throw new Exception("Uncompatibles comments lines in the file."); + if (commentToken == null) { + throw new Exception("Incompatibles comments lines in the file."); } + return linePattern.substring(0, linePattern.indexOf(commentToken) + 1); } } diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java index e476adc9c..54ee9d730 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java @@ -22,9 +22,8 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Portions copyright 2013-2016 ForgeRock AS */ - package com.forgerock.opendj.ldap.extensions; import java.io.IOException; @@ -87,31 +86,31 @@ public GetConnectionIDExtendedResult decodeExtendedResult(final ExtendedResult r final DecodeOptions options) throws DecodeException { if (result instanceof GetConnectionIDExtendedResult) { return (GetConnectionIDExtendedResult) result; - } else { - final ResultCode resultCode = result.getResultCode(); - final GetConnectionIDExtendedResult newResult = - GetConnectionIDExtendedResult.newResult(resultCode).setMatchedDN( - result.getMatchedDN()).setDiagnosticMessage( - result.getDiagnosticMessage()); - - final ByteString responseValue = result.getValue(); - if (!resultCode.isExceptional() && responseValue == null) { - throw DecodeException.error(LocalizableMessage.raw("Empty response value")); - } - if (responseValue != null) { - try { - final ASN1Reader reader = ASN1.getReader(responseValue); - newResult.setConnectionID((int) reader.readInteger()); - } catch (final IOException e) { - throw DecodeException.error(LocalizableMessage - .raw("Error decoding response value"), e); - } - } - for (final Control control : result.getControls()) { - newResult.addControl(control); + } + + final ResultCode resultCode = result.getResultCode(); + final GetConnectionIDExtendedResult newResult = + GetConnectionIDExtendedResult.newResult(resultCode) + .setMatchedDN(result.getMatchedDN()) + .setDiagnosticMessage(result.getDiagnosticMessage()); + + final ByteString responseValue = result.getValue(); + if (!resultCode.isExceptional() && responseValue == null) { + throw DecodeException.error(LocalizableMessage.raw("Empty response value")); + } + if (responseValue != null) { + try { + final ASN1Reader reader = ASN1.getReader(responseValue); + newResult.setConnectionID((int) reader.readInteger()); + } catch (final IOException e) { + throw DecodeException.error(LocalizableMessage + .raw("Error decoding response value"), e); } - return newResult; } + for (final Control control : result.getControls()) { + newResult.addControl(control); + } + return newResult; } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java index 0fd5d4a1d..472369391 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java @@ -20,9 +20,8 @@ * * CDDL HEADER END * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import static com.forgerock.opendj.util.StaticUtils.getProvider; @@ -94,12 +93,6 @@ abstract class CommonLDAPOptions { *

* The default setting is {@code -1} (disabled) and may be configured using * the {@code org.forgerock.opendj.io.linger} property. - * - * @param linger - * The value of the {@link java.net.SocketOptions#SO_LINGER - * SO_LINGER} socket option for new connections, or -1 if linger - * should be disabled. - * @return A reference to this set of options. */ public static final Option SO_LINGER_IN_SECONDS = Option.withDefault( getIntProperty("org.forgerock.opendj.io.linger", -1)); @@ -110,7 +103,6 @@ abstract class CommonLDAPOptions { *

* The default setting is {@code true} and may be configured using the * {@code org.forgerock.opendj.io.keepAlive} property. - * */ public static final Option SO_KEEPALIVE = Option.withDefault( getBooleanProperty("org.forgerock.opendj.io.keepAlive", true)); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java index 0e1196a64..27cbe6e31 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; @@ -72,24 +72,24 @@ public final C getControl(final ControlDecoder decoder, final List controls = impl.getControls(); final Control control = AbstractRequestImpl.getControl(controls, decoder.getOID()); - if (control != null) { - // Got a match. Return a defensive copy only if necessary. - final C decodedControl = decoder.decodeControl(control, options); - if (decodedControl != control) { - // This was not the original control so return it - // immediately. - return decodedControl; - } else if (decodedControl instanceof GenericControl) { - // Generic controls are immutable, so return it immediately. - return decodedControl; - } else { - // Re-decode to get defensive copy. - final GenericControl genericControl = GenericControl.newControl(control); - return decoder.decodeControl(genericControl, options); - } - } else { + if (control == null) { return null; } + + // Got a match. Return a defensive copy only if necessary. + final C decodedControl = decoder.decodeControl(control, options); + if (decodedControl != control) { + // This was not the original control so return it + // immediately. + return decodedControl; + } else if (decodedControl instanceof GenericControl) { + // Generic controls are immutable, so return it immediately. + return decodedControl; + } else { + // Re-decode to get defensive copy. + final GenericControl genericControl = GenericControl.newControl(control); + return decoder.decodeControl(genericControl, options); + } } @Override diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java index 0a928a322..3b03ffb0d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Portions Copyright 2011-2016 ForgeRock AS * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; @@ -516,9 +516,8 @@ public AttributeType getAttributeType(final Schema schema, final String name) { final AttributeType type = getAttributeType0(name); if (type != null) { return type; - } else { - throw new UnknownSchemaElementException(WARN_ATTR_TYPE_UNKNOWN.get(name)); } + throw new UnknownSchemaElementException(WARN_ATTR_TYPE_UNKNOWN.get(name)); } @Override @@ -1835,7 +1834,7 @@ public boolean validateEntry(final Entry entry, final SchemaValidationPolicy pol // should be valid. foundMatchingNameForms = true; - if (checkNameForm(entry, policy, nameFormWarnings, nf)) { + if (checkNameForm(entry, nameFormWarnings, nf)) { nameForm = nf; break; } @@ -2117,8 +2116,8 @@ private boolean checkDITStructureRule(final Entry entry, return true; } - private boolean checkNameForm(final Entry entry, final SchemaValidationPolicy policy, - final List nameFormWarnings, final NameForm nameForm) { + private boolean checkNameForm(final Entry entry, final List nameFormWarnings, + final NameForm nameForm) { final RDN rdn = entry.getName().rdn(); if (rdn != null) { // Make sure that all the required AVAs are present. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java index 49166230e..0d4d24d51 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java @@ -21,11 +21,12 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.spi; +import static org.forgerock.opendj.ldap.spi.LdapPromises.*; + import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; @@ -33,14 +34,12 @@ import org.forgerock.opendj.ldap.LdapException; import org.forgerock.opendj.ldap.LdapPromise; import org.forgerock.util.AsyncFunction; -import org.forgerock.util.promise.ExceptionHandler; import org.forgerock.util.Function; +import org.forgerock.util.promise.ExceptionHandler; import org.forgerock.util.promise.Promise; import org.forgerock.util.promise.ResultHandler; import org.forgerock.util.promise.RuntimeExceptionHandler; -import static org.forgerock.opendj.ldap.spi.LdapPromises.*; - /** * Provides a {@link Promise} wrapper and a {@link LdapPromise} implementation. * @@ -63,7 +62,6 @@ public LdapPromiseWrapper(P wrappedPromise, int requestID) { this.requestID = requestID; } - @SuppressWarnings("unchecked") @Override public int getRequestID() { return wrappedPromise instanceof LdapPromise ? ((LdapPromise) wrappedPromise).getRequestID() diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java index 031964db1..0f21ea5ad 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -304,16 +304,16 @@ private Object[][] byteStringBuilderProvider() throws Exception { b(0xFF), b(0xFF), b(0xFF), b(0xFF), b(0xFF) } }, { new ByteStringBuilder(11).appendUtf8("this is a").appendUtf8(" test"), "this is a test".getBytes("UTF-8") }, - { new ByteStringBuilder().appendObject((Object) "this is a").appendObject((Object) " test"), + { new ByteStringBuilder().appendObject("this is a").appendObject(" test"), "this is a test".getBytes("UTF-8") }, { new ByteStringBuilder().appendUtf8("this is a".toCharArray()).appendUtf8( " test".toCharArray()), "this is a test".getBytes("UTF-8") }, { - new ByteStringBuilder().appendObject((Object) "this is a".toCharArray()).appendObject( - (Object) " test".toCharArray()), "this is a test".getBytes("UTF-8") }, + new ByteStringBuilder().appendObject("this is a".toCharArray()).appendObject( + " test".toCharArray()), "this is a test".getBytes("UTF-8") }, { - new ByteStringBuilder().appendObject((Object) EIGHT_BYTES).appendObject((Object) EIGHT_BYTES), + new ByteStringBuilder().appendObject(EIGHT_BYTES).appendObject(EIGHT_BYTES), new byte[] { b(0x01), b(0x02), b(0x03), b(0x04), b(0x05), b(0x06), b(0x07), b(0x08), b(0x01), b(0x02), b(0x03), b(0x04), b(0x05), b(0x06), b(0x07), b(0x08) } }, diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java index fb3a378c6..21f08aed9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -77,13 +77,13 @@ public Object[][] byteSequenceProvider() throws Exception { new byte[] { (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 } }, { ByteString.valueOfUtf8("cn=testvalue"), "cn=testvalue".getBytes("UTF-8") }, - { ByteString.valueOfObject((Object) "cn=testvalue"), "cn=testvalue".getBytes("UTF-8") }, + { ByteString.valueOfObject("cn=testvalue"), "cn=testvalue".getBytes("UTF-8") }, { ByteString.valueOfUtf8("cn=testvalue".toCharArray()), "cn=testvalue".getBytes("UTF-8") }, - { ByteString.valueOfObject((Object) "cn=testvalue".toCharArray()), + { ByteString.valueOfObject("cn=testvalue".toCharArray()), "cn=testvalue".getBytes("UTF-8") }, { ByteString.valueOfBytes(new byte[0]), new byte[0] }, { ByteString.valueOfBytes(testBytes), testBytes }, - { ByteString.valueOfObject((Object) testBytes), testBytes }, + { ByteString.valueOfObject(testBytes), testBytes }, { ByteString.valueOfObject(ByteString.valueOfUtf8("cn=testvalue")), "cn=testvalue".getBytes("UTF-8") }, { ByteString.wrap(new byte[0]), new byte[0] }, diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java index 3668c6be0..71501193d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java @@ -21,9 +21,8 @@ * CDDL HEADER END * * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import static org.fest.assertions.Assertions.assertThat; @@ -307,7 +306,6 @@ public void testHeartBeatTimeout() throws Exception { assertThat(hbc.isClosed()).isFalse(); } - @SuppressWarnings({ "rawtypes", "unchecked" }) @Test(description = "OPENDJ-1348") public void testBindPreventsHeartBeatTimeout() throws Exception { mockConnectionWithInitialHeartbeatResult(ResultCode.SUCCESS); @@ -366,7 +364,6 @@ public void testBindTriggersHeartBeatTimeoutWhenTooSlow() throws Exception { assertThat(hbc.isValid()).isFalse(); } - @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testHeartBeatWhileBindInProgress() throws Exception { mockConnectionWithInitialHeartbeatResult(ResultCode.SUCCESS); From 3e479976a6876a263a30a4eba23e09cc688ccbc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Thu, 31 Dec 2015 15:39:32 +0100 Subject: [PATCH 010/125] MemoryBackendTestCase.java: Improve test --- .../opendj/ldap/MemoryBackendTestCase.java | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java index 31eadf39e..8836f2650 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java @@ -21,21 +21,17 @@ * CDDL HEADER END * * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; -import static org.fest.assertions.Assertions.assertThat; -import static org.forgerock.opendj.ldap.Connections.newInternalConnection; -import static org.forgerock.opendj.ldap.requests.Requests.newAddRequest; -import static org.forgerock.opendj.ldap.requests.Requests.newDeleteRequest; -import static org.forgerock.opendj.ldap.requests.Requests.newModifyRequest; -import static org.forgerock.opendj.ldap.requests.Requests.newSimpleBindRequest; -import static org.forgerock.opendj.ldif.LDIFEntryReader.valueOfLDIFEntry; +import static org.fest.assertions.Assertions.*; +import static org.forgerock.opendj.ldap.Connections.*; +import static org.forgerock.opendj.ldap.requests.Requests.*; +import static org.forgerock.opendj.ldif.LDIFEntryReader.*; import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -52,6 +48,7 @@ import org.forgerock.opendj.ldap.responses.SearchResultEntry; import org.forgerock.opendj.ldif.ConnectionEntryReader; import org.forgerock.opendj.ldif.LDIFEntryReader; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; /** @@ -148,15 +145,11 @@ public void testDeleteNoSuchObject() throws Exception { connection.delete("uid=missing,ou=people,dc=example,dc=com"); } - @Test + @Test(expectedExceptions = EntryNotFoundException.class) public void testDeleteOnLeaf() throws Exception { final Connection connection = getConnection(); connection.delete("uid=test1,ou=people,dc=example,dc=com"); - try { - connection.readEntry("dc=example,dc=com"); - } catch (final EntryNotFoundException expected) { - // Do nothing. - } + connection.readEntry("uid=test1,ou=people,dc=example,dc=com"); } @Test(expectedExceptions = ConstraintViolationException.class) @@ -188,19 +181,25 @@ PreReadResponseControl.DECODER, new DecodeOptions()).getEntry()).isEqualTo( "dc: xxx")); } - @Test - public void testDeleteSubtree() throws Exception { + @DataProvider + public Object[][] deleteSubtreeData() { + return new Object[][] { + { "dc=example,dc=com" }, + { "ou=people,dc=example,dc=com" }, + { "uid=test1,ou=people,dc=example,dc=com" }, + { "uid=test2,ou=people,dc=example,dc=com" }, + }; + } + + @Test(dataProvider = "deleteSubtreeData", expectedExceptions = EntryNotFoundException.class) + public void testDeleteSubtree(final String name) throws Exception { final Connection connection = getConnection(); connection.deleteSubtree("dc=example,dc=com"); - for (final String name : Arrays.asList("dc=example,dc=com", "ou=people,dc=example,dc=com", - "uid=test1,ou=people,dc=example,dc=com", "uid=test2,ou=people,dc=example,dc=com")) { - try { - connection.readEntry(name); - } catch (final EntryNotFoundException expected) { - // Do nothing. - } + try { + connection.readEntry(name); + } finally { + assertThat(connection.readEntry("dc=xxx,dc=com")).isNotNull(); } - assertThat(connection.readEntry("dc=xxx,dc=com")).isNotNull(); } @Test @@ -667,8 +666,8 @@ private Connection getConnection() throws IOException { private int getNumberOfEntries(String[] ldifEntries) { int entries = 0; - for (int i = 0; i < ldifEntries.length; i++) { - if (ldifEntries[i].startsWith("dn: ")) { + for (String ldifEntry : ldifEntries) { + if (ldifEntry.startsWith("dn: ")) { entries++; } } From 14b1b80913a2a212e2d6be9b09ec5fbf90c79db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Thu, 31 Dec 2015 15:40:06 +0100 Subject: [PATCH 011/125] Convert == to String.equals() which embeds == check --- .../src/main/java/org/forgerock/opendj/ldap/schema/Schema.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java index 3b03ffb0d..7d0f96a9d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java @@ -504,8 +504,7 @@ public MatchingRule getDefaultMatchingRule() { @Override public String getOIDForName(String lowerCaseName) { final String oid = name2OIDs.get(lowerCaseName); - // == is correct, AMBIGUOUS_OID is singleton to mark an entry ambiguous - if (oid == SchemaBuilder.AMBIGUOUS_OID) { + if (SchemaBuilder.AMBIGUOUS_OID.equals(oid)) { throw new UnknownSchemaElementException(WARN_NAME_AMBIGUOUS.get(lowerCaseName)); } return oid; From 58bfe9e14910ddca57a2e4ba3623cf4db16449e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 6 Jan 2016 10:45:18 +0100 Subject: [PATCH 012/125] Code cleanup: for -> foreach --- .../opendj/ldif/ConnectionEntryReaderTestCase.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java index ec26ad827..d53751afa 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java @@ -21,9 +21,8 @@ * CDDL HEADER END * * - * Copyright 2011-2014 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS */ - package org.forgerock.opendj.ldif; import java.util.NoSuchElementException; @@ -253,8 +252,7 @@ public LdapPromise answer(final InvocationOnMock invocation) throws Thro // Execute handler and return future. final SearchResultHandler handler = (SearchResultHandler) invocation.getArguments()[1]; if (handler != null) { - for (int i = 0; i < responses.length; i++) { - final Object response = responses[i]; + for (final Object response : responses) { if (response instanceof SearchResultEntry) { handler.handleEntry((SearchResultEntry) response); } else if (response instanceof SearchResultReference) { From 3d30882412d6ab430a0b0dfbf72d92f598ab2dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 6 Jan 2016 10:47:08 +0100 Subject: [PATCH 013/125] Added @Override annotations, removed {@inheritDoc} --- .../opendj/cli/ApplicationKeyManager.java | 8 +- .../opendj/cli/ArgumentException.java | 4 +- .../forgerock/opendj/cli/CommandBuilder.java | 3 +- .../com/forgerock/opendj/cli/MenuBuilder.java | 11 +- .../opendj/cli/PromptingTrustManager.java | 13 +- .../com/forgerock/opendj/cli/SubCommand.java | 12 +- .../forgerock/opendj/cli/TableBuilder.java | 5 +- .../forgerock/maven/CheckCopyrightMojo.java | 3 +- .../AccountUsabilityRequestControl.java | 21 +-- .../AccountUsabilityResponseControl.java | 42 ++--- .../RealAttributesOnlyRequestControl.java | 21 +-- .../VirtualAttributesOnlyRequestControl.java | 21 +-- .../GetConnectionIDExtendedRequest.java | 14 +- .../GetSymmetricKeyExtendedRequest.java | 5 +- .../PasswordPolicyStateExtendedResult.java | 17 +- .../PasswordPolicyStateOperationType.java | 174 +++++------------- .../forgerock/opendj/util/ASCIICharProp.java | 7 +- .../com/forgerock/opendj/util/Iterators.java | 43 ++--- .../opendj/util/OperatingSystem.java | 3 +- .../opendj/io/ASN1InputStreamReader.java | 42 ++--- .../org/forgerock/opendj/io/ASN1Reader.java | 3 +- .../org/forgerock/opendj/io/ASN1Writer.java | 4 +- .../opendj/io/AbstractASN1Reader.java | 28 ++- .../opendj/io/AbstractASN1Writer.java | 30 ++- .../opendj/ldap/AbstractAttribute.java | 38 ++-- .../opendj/ldap/AbstractFilterVisitor.java | 12 ++ .../org/forgerock/opendj/ldap/Attribute.java | 18 +- .../opendj/ldap/AttributeDescription.java | 12 +- .../opendj/ldap/DecodeException.java | 7 +- .../forgerock/opendj/ldap/DecodeOptions.java | 7 +- .../java/org/forgerock/opendj/ldap/Entry.java | 5 +- .../org/forgerock/opendj/ldap/Functions.java | 15 +- .../forgerock/opendj/ldap/KeyManagers.java | 20 +- .../opendj/ldap/LinkedHashMapEntry.java | 3 +- .../org/forgerock/opendj/ldap/Matcher.java | 13 +- .../forgerock/opendj/ldap/SchemaResolver.java | 4 +- .../org/forgerock/opendj/ldap/SortKey.java | 4 +- .../forgerock/opendj/ldap/TreeMapEntry.java | 3 +- .../forgerock/opendj/ldap/TrustManagers.java | 44 ++--- .../controls/AssertionRequestControl.java | 22 +-- .../AuthorizationIdentityRequestControl.java | 21 +-- .../AuthorizationIdentityResponseControl.java | 22 +-- ...ntryChangeNotificationResponseControl.java | 8 +- .../opendj/ldap/controls/GenericControl.java | 11 +- .../GetEffectiveRightsRequestControl.java | 24 +-- .../controls/ManageDsaITRequestControl.java | 21 +-- .../controls/MatchedValuesRequestControl.java | 21 +-- .../PasswordExpiredResponseControl.java | 22 +-- .../PasswordExpiringResponseControl.java | 22 +-- .../PasswordPolicyRequestControl.java | 23 +-- .../PasswordPolicyResponseControl.java | 31 ++-- .../PermissiveModifyRequestControl.java | 21 +-- .../PersistentSearchRequestControl.java | 22 +-- .../ldap/controls/PostReadRequestControl.java | 17 +- .../controls/PostReadResponseControl.java | 17 +- .../ldap/controls/PreReadRequestControl.java | 17 +- .../ldap/controls/PreReadResponseControl.java | 17 +- .../controls/ProxiedAuthV1RequestControl.java | 22 +-- .../controls/ProxiedAuthV2RequestControl.java | 22 +-- .../ServerSideSortRequestControl.java | 30 ++- .../ServerSideSortResponseControl.java | 26 +-- .../controls/SimplePagedResultsControl.java | 27 +-- .../controls/SubentriesRequestControl.java | 21 +-- .../controls/SubtreeDeleteRequestControl.java | 21 +-- .../VirtualListViewRequestControl.java | 30 ++- .../VirtualListViewResponseControl.java | 22 +-- .../ldap/schema/AbstractSyntaxImpl.java | 6 + .../opendj/ldap/schema/AttributeType.java | 3 +- .../opendj/ldap/schema/BinarySyntaxImpl.java | 19 +- .../ldap/schema/BitStringSyntaxImpl.java | 18 +- .../opendj/ldap/schema/BooleanSyntaxImpl.java | 18 +- .../CertificateExactAssertionSyntaxImpl.java | 8 +- .../schema/CertificateListSyntaxImpl.java | 18 +- .../schema/CertificatePairSyntaxImpl.java | 18 +- .../ldap/schema/CountryStringSyntaxImpl.java | 18 +- .../ldap/schema/DITContentRuleSyntaxImpl.java | 6 +- .../ldap/schema/DeliveryMethodSyntaxImpl.java | 19 +- ...irstComponentEqualityMatchingRuleImpl.java | 3 +- .../schema/DirectoryStringSyntaxImpl.java | 19 +- ...inguishedNameEqualityMatchingRuleImpl.java | 4 +- .../schema/DistinguishedNameSyntaxImpl.java | 4 + ...eMetaphoneApproximateMatchingRuleImpl.java | 4 +- .../ldap/schema/EnhancedGuideSyntaxImpl.java | 17 +- .../opendj/ldap/schema/EnumSyntaxImpl.java | 5 +- .../schema/FacsimileNumberSyntaxImpl.java | 19 +- .../opendj/ldap/schema/FaxSyntaxImpl.java | 18 +- ...neralizedTimeEqualityMatchingRuleImpl.java | 3 +- ...neralizedTimeOrderingMatchingRuleImpl.java | 3 +- .../schema/GeneralizedTimeSyntaxImpl.java | 19 +- .../opendj/ldap/schema/GuideSyntaxImpl.java | 17 +- .../ldap/schema/IA5StringSyntaxImpl.java | 18 +- ...irstComponentEqualityMatchingRuleImpl.java | 3 +- .../opendj/ldap/schema/IntegerSyntaxImpl.java | 18 +- .../opendj/ldap/schema/JPEGSyntaxImpl.java | 16 +- .../KeywordEqualityMatchingRuleImpl.java | 4 +- .../ldap/schema/MatchingRuleSyntaxImpl.java | 16 +- .../schema/MatchingRuleUseSyntaxImpl.java | 16 +- .../schema/NameAndOptionalUIDSyntaxImpl.java | 18 +- .../ldap/schema/NameFormSyntaxImpl.java | 5 +- ...NumericStringEqualityMatchingRuleImpl.java | 3 +- ...NumericStringOrderingMatchingRuleImpl.java | 3 +- ...umericStringSubstringMatchingRuleImpl.java | 3 +- .../ldap/schema/NumericStringSyntaxImpl.java | 18 +- .../opendj/ldap/schema/OIDSyntaxImpl.java | 19 +- .../OctetStringEqualityMatchingRuleImpl.java | 3 +- .../OctetStringOrderingMatchingRuleImpl.java | 3 +- .../OctetStringSubstringMatchingRuleImpl.java | 3 +- .../ldap/schema/OctetStringSyntaxImpl.java | 18 +- .../ldap/schema/OtherMailboxSyntaxImpl.java | 18 +- .../ldap/schema/PostalAddressSyntaxImpl.java | 18 +- .../schema/PresentationAddressSyntaxImpl.java | 18 +- .../schema/PrintableStringSyntaxImpl.java | 18 +- .../schema/ProtocolInformationSyntaxImpl.java | 18 +- .../opendj/ldap/schema/RegexSyntaxImpl.java | 4 + .../opendj/ldap/schema/SchemaException.java | 4 +- .../schema/SubstringAssertionSyntaxImpl.java | 18 +- .../schema/SupportedAlgorithmSyntaxImpl.java | 18 +- ...lephoneNumberEqualityMatchingRuleImpl.java | 3 +- ...ephoneNumberSubstringMatchingRuleImpl.java | 3 +- .../schema/TelephoneNumberSyntaxImpl.java | 19 +- .../TeletexTerminalIdentifierSyntaxImpl.java | 19 +- .../ldap/schema/TelexNumberSyntaxImpl.java | 18 +- .../opendj/ldap/schema/UTCTimeSyntaxImpl.java | 19 +- .../opendj/ldap/schema/UUIDSyntaxImpl.java | 18 +- .../UniqueMemberEqualityMatchingRuleImpl.java | 3 +- ...PasswordExactEqualityMatchingRuleImpl.java | 3 +- .../ldap/schema/UserPasswordSyntaxImpl.java | 4 + .../ldap/spi/ResultLdapPromiseImpl.java | 4 +- .../forgerock/opendj/ldif/ChangeRecord.java | 19 +- .../ldif/ChangeRecordVisitorWriter.java | 5 + .../opendj/ldif/ChangeRecordWriter.java | 4 +- .../ldif/ConnectionChangeRecordWriter.java | 10 +- .../opendj/ldif/ConnectionEntryWriter.java | 6 +- .../forgerock/opendj/ldif/EntryWriter.java | 4 +- .../java/org/forgerock/opendj/ldif/LDIF.java | 10 +- .../opendj/ldif/LDIFEntryWriter.java | 7 +- .../ldif/RejectedChangeRecordListener.java | 14 +- .../GSSAPISASLBindRequestTestCase.java | 3 +- .../ldap/requests/RequestsTestCase.java | 4 +- .../opendj/ldap/schema/AttributeTypeTest.java | 4 +- ...aseIgnoreIA5SubstringMatchingRuleTest.java | 3 + .../CaseIgnoreSubstringMatchingRuleTest.java | 3 + .../CollationSubstringMatchingRuleTest.java | 4 +- ...inguishedNameEqualityMatchingRuleTest.java | 5 +- .../schema/EntrySchemaCheckingTestCase.java | 3 +- ...artialDateAndTimeMatchingRuleTestCase.java | 3 +- ...lativeTimeGreaterThanMatchingRuleTest.java | 3 +- .../RelativeTimeLessThanMatchingRuleTest.java | 3 +- .../opendj/ldap/spi/ConnectionStateTest.java | 3 +- .../opendj/grizzly/ASN1BufferReader.java | 43 +++-- .../opendj/grizzly/ASN1BufferWriter.java | 58 +++--- .../ConnectionSecurityLayerFilter.java | 6 +- .../opendj/grizzly/LDAPClientFilter.java | 3 +- .../opendj/ldap/tools/DataSource.java | 14 +- 154 files changed, 910 insertions(+), 1373 deletions(-) mode change 100755 => 100644 opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java old mode 100755 new mode 100644 index 132124fc9..b2d3cf37a --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java @@ -23,7 +23,7 @@ * * Copyright 2008-2010 Sun Microsystems, Inc. * Portions Copyright 2009 Parametric Technology Corporation (PTC) - * Portions copyright 2014 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -160,6 +160,7 @@ final class ApplicationKeyManager implements X509KeyManager { * @return the alias name for the desired key, or null if there are no * matches. */ + @Override public String chooseClientAlias(final String[] keyType, final Principal[] issuers, final Socket socket) { if (keyManager != null) { @@ -186,6 +187,7 @@ public String chooseClientAlias(final String[] keyType, final Principal[] issuer * @return the alias name for the desired key, or null if there are no * matches. */ + @Override public String chooseServerAlias(final String keyType, final Principal[] issuers, final Socket socket) { if (keyManager != null) { return keyManager.chooseServerAlias(keyType, issuers, socket); @@ -202,6 +204,7 @@ public String chooseServerAlias(final String keyType, final Principal[] issuers, * and the root certificate authority last), or null if the alias * can't be found. */ + @Override public X509Certificate[] getCertificateChain(final String alias) { if (keyManager != null) { return keyManager.getCertificateChain(alias); @@ -222,6 +225,7 @@ public X509Certificate[] getCertificateChain(final String alias) { * @return an array of the matching alias names, or null if there were no * matches. */ + @Override public String[] getClientAliases(final String keyType, final Principal[] issuers) { if (keyManager != null) { return keyManager.getClientAliases(keyType, issuers); @@ -236,6 +240,7 @@ public String[] getClientAliases(final String keyType, final Principal[] issuers * the alias name * @return the requested key, or null if the alias can't be found. */ + @Override public PrivateKey getPrivateKey(final String alias) { if (keyManager != null) { return keyManager.getPrivateKey(alias); @@ -256,6 +261,7 @@ public PrivateKey getPrivateKey(final String alias) { * @return an array of the matching alias names, or null if there were no * matches. */ + @Override public String[] getServerAliases(final String keyType, final Principal[] issuers) { if (keyManager != null) { return keyManager.getServerAliases(keyType, issuers); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java index 1b20baf91..e9b164899 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -63,7 +63,7 @@ public ArgumentException(final LocalizableMessage message, final Throwable cause this.message = message; } - /** {@inheritDoc} */ + @Override public LocalizableMessage getMessageObject() { return this.message; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java index b49b1f968..c37ad311e 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java @@ -22,7 +22,7 @@ * * * Copyright 2008-2009 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -141,6 +141,7 @@ public void append(final CommandBuilder builder) { * * @return The String representation of this command builder (i.e. what we want to show to the user). */ + @Override public String toString() { return toString(false, LINE_SEPARATOR); } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java index cdec9a48d..98e56213a 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java @@ -22,11 +22,12 @@ * * * Copyright 2007-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; import static com.forgerock.opendj.cli.CliMessages.*; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -68,7 +69,7 @@ public CompositeCallback(Collection> callbacks) { this.callbacks = callbacks; } - /** {@inheritDoc} */ + @Override public MenuResult invoke(ConsoleApplication app) throws ClientException { List values = new ArrayList<>(); for (MenuCallback callback : callbacks) { @@ -145,12 +146,13 @@ private MenuImpl(ConsoleApplication app, LocalizableMessage title, LocalizableMe this.nMaxTries = nMaxTries; } - /** {@inheritDoc} */ + @Override public MenuResult run() throws ClientException { // The validation call-back which will be used to determine the // action call-back. ValidationCallback> validator = new ValidationCallback>() { + @Override public MenuCallback validate(ConsoleApplication app, String input) { String ninput = input.trim(); @@ -287,7 +289,7 @@ private ResultCallback(MenuResult result) { this.result = result; } - /** {@inheritDoc} */ + @Override public MenuResult invoke(ConsoleApplication app) throws ClientException { return result; } @@ -420,6 +422,7 @@ public void addCharOption(LocalizableMessage c, LocalizableMessage description, public void addHelpOption(final HelpCallback callback) { MenuCallback wrapper = new MenuCallback() { + @Override public MenuResult invoke(ConsoleApplication app) throws ClientException { app.println(); callback.display(app); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java index d90ea0298..c613fc36e 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java @@ -22,7 +22,7 @@ * * * Copyright 2008-2010 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -54,9 +54,7 @@ * like to trust a server certificate. */ public final class PromptingTrustManager implements X509TrustManager { - /** - * Enumeration description server certificate trust option. - */ + /** Enumeration description server certificate trust option. */ private static enum TrustOption { UNTRUSTED(1, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO.get()), SESSION(2, INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION.get()), @@ -64,7 +62,6 @@ private static enum TrustOption { CERTIFICATE_DETAILS(4, INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS.get()); private Integer choice; - private LocalizableMessage msg; /** @@ -209,7 +206,7 @@ public PromptingTrustManager(final ConsoleApplication app, final X509TrustManage this(app, DEFAULT_PATH, sourceTrustManager); } - /** {@inheritDoc} */ + @Override public void checkClientTrusted(final X509Certificate[] x509Certificates, final String s) throws CertificateException { try { @@ -231,7 +228,7 @@ public void checkClientTrusted(final X509Certificate[] x509Certificates, final S } } - /** {@inheritDoc} */ + @Override public void checkServerTrusted(final X509Certificate[] x509Certificates, final String s) throws CertificateException { try { @@ -253,7 +250,7 @@ public void checkServerTrusted(final X509Certificate[] x509Certificates, final S } } - /** {@inheritDoc} */ + @Override public X509Certificate[] getAcceptedIssuers() { if (nestedTrustManager != null) { return nestedTrustManager.getAcceptedIssuers(); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java index c26ba9fa8..15c21f319 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -69,10 +69,7 @@ public class SubCommand implements DocDescriptionSupplement { /** The minimum number of unnamed trailing arguments that may be provided. */ private int minTrailingArguments; - /** - * The display name that will be used for the trailing arguments in - * the usage information. - */ + /** The display name that will be used for the trailing arguments in the usage information. */ private String trailingArgsDisplayName; /** @@ -166,12 +163,12 @@ public LocalizableMessage getDescription() { */ private LocalizableMessage docDescriptionSupplement; - /** {@inheritDoc} */ + @Override public LocalizableMessage getDocDescriptionSupplement() { return docDescriptionSupplement != null ? docDescriptionSupplement : LocalizableMessage.EMPTY; } - /** {@inheritDoc} */ + @Override public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { this.docDescriptionSupplement = docDescriptionSupplement; } @@ -365,7 +362,6 @@ public void setHidden(boolean isHidden) { this.isHidden = isHidden; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder sb = new StringBuilder(); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java index 11b1a333a..6f3793045 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java @@ -22,7 +22,7 @@ * * * Copyright 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -266,7 +266,7 @@ public void print(TablePrinter printer) { List> sortedRows = new ArrayList<>(rows); Comparator> comparator = new Comparator>() { - + @Override public int compare(List row1, List row2) { for (int i = 0; i < sortKeys.size(); i++) { String cell1 = row1.get(sortKeys.get(i)); @@ -281,7 +281,6 @@ public int compare(List row1, List row2) { // Both rows are equal. return 0; } - }; Collections.sort(sortedRows, comparator); diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java index 8a56c02ee..d93d69634 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; @@ -58,6 +58,7 @@ public class CheckCopyrightMojo extends CopyrightAbstractMojo { * @throws MojoExecutionException * if any */ + @Override public void execute() throws MojoFailureException, MojoExecutionException { if (checkDisabled) { getLog().info("Copyright check is disabled"); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java index 22989777f..1825cd5cf 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; @@ -44,9 +45,7 @@ * @see AccountUsabilityResponseControl */ public final class AccountUsabilityRequestControl implements Control { - /** - * The OID for the account usability request control. - */ + /** The OID for the account usability request control. */ public static final String OID = "1.3.6.1.4.1.42.2.27.9.5.8"; private final boolean isCritical; @@ -56,13 +55,11 @@ public final class AccountUsabilityRequestControl implements Control { private static final AccountUsabilityRequestControl NONCRITICAL_INSTANCE = new AccountUsabilityRequestControl(false); - /** - * A decoder which can be used for decoding the account usability request - * control. - */ + /** A decoder which can be used for decoding the account usability request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public AccountUsabilityRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -86,6 +83,7 @@ public AccountUsabilityRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -110,27 +108,26 @@ private AccountUsabilityRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java index 7c1f5325a..cd150668d 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package com.forgerock.opendj.ldap.controls; @@ -70,18 +70,14 @@ public final class AccountUsabilityResponseControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the account usability response control. - */ + /** The OID for the account usability response control. */ public static final String OID = AccountUsabilityRequestControl.OID; - /** - * A decoder which can be used for decoding the account usability response - * control. - */ + /** A decoder which can be used for decoding the account usability response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public AccountUsabilityResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -157,21 +153,16 @@ public AccountUsabilityResponseControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } }; - /** - * The BER type to use for the seconds before expiration when the account is - * available. - */ + /** The BER type to use for the seconds before expiration when the account is available. */ private static final byte TYPE_SECONDS_BEFORE_EXPIRATION = (byte) 0x80; - /** - * The BER type to use for the MORE_INFO sequence when the account is not - * available. - */ + /** The BER type to use for the MORE_INFO sequence when the account is not available. */ private static final byte TYPE_MORE_INFO = (byte) 0xA1; /** @@ -273,16 +264,10 @@ public static AccountUsabilityResponseControl newControl(final int secondsBefore /** The number of remaining grace logins, if available. */ private final int remainingGraceLogins; - /** - * The length of time in seconds before the user's password expires, - * if available. - */ + /** The length of time in seconds before the user's password expires, if available. */ private final int secondsBeforeExpiration; - /** - * The length of time before the user's account is unlocked, if - * available. - */ + /** The length of time before the user's account is unlocked, if available. */ private final int secondsBeforeUnlock; private final boolean isCritical; @@ -303,7 +288,7 @@ private AccountUsabilityResponseControl(final boolean isCritical, final boolean this.secondsBeforeExpiration = secondsBeforeExpiration; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -344,7 +329,7 @@ public int getSecondsBeforeUnlock() { return secondsBeforeUnlock; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -381,12 +366,12 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } @@ -444,7 +429,6 @@ public boolean isUsable() { return isUsable; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java index 69ddf7394..5690f1dda 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; @@ -42,9 +43,7 @@ * control is 2.16.840.1.113730.3.4.17, and it does not have a value. */ public final class RealAttributesOnlyRequestControl implements Control { - /** - * The OID for the real attributes only request control. - */ + /** The OID for the real attributes only request control. */ public static final String OID = "2.16.840.1.113730.3.4.17"; private static final RealAttributesOnlyRequestControl CRITICAL_INSTANCE = @@ -53,13 +52,11 @@ public final class RealAttributesOnlyRequestControl implements Control { private static final RealAttributesOnlyRequestControl NONCRITICAL_INSTANCE = new RealAttributesOnlyRequestControl(false); - /** - * A decoder which can be used for decoding the real attributes only request - * control. - */ + /** A decoder which can be used for decoding the real attributes only request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public RealAttributesOnlyRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -83,6 +80,7 @@ public RealAttributesOnlyRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -108,27 +106,26 @@ private RealAttributesOnlyRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java index a0567750d..3321ae28c 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; @@ -42,9 +43,7 @@ * control is 2.16.840.1.113730.3.4.19, and it does not have a value. */ public final class VirtualAttributesOnlyRequestControl implements Control { - /** - * The OID for the virtual attributes only request control. - */ + /** The OID for the virtual attributes only request control. */ public static final String OID = "2.16.840.1.113730.3.4.19"; private static final VirtualAttributesOnlyRequestControl CRITICAL_INSTANCE = @@ -53,13 +52,11 @@ public final class VirtualAttributesOnlyRequestControl implements Control { private static final VirtualAttributesOnlyRequestControl NONCRITICAL_INSTANCE = new VirtualAttributesOnlyRequestControl(false); - /** - * A decoder which can be used for decoding the virtual attributes only - * request control. - */ + /** A decoder which can be used for decoding the virtual attributes only request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public VirtualAttributesOnlyRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -83,6 +80,7 @@ public VirtualAttributesOnlyRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -108,27 +106,26 @@ private VirtualAttributesOnlyRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java index 54ee9d730..f7108abd5 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java @@ -54,6 +54,7 @@ public final class GetConnectionIDExtendedRequest extends private static final class RequestDecoder implements ExtendedRequestDecoder { + @Override public GetConnectionIDExtendedRequest decodeExtendedRequest( final ExtendedRequest request, final DecodeOptions options) throws DecodeException { @@ -69,7 +70,7 @@ public GetConnectionIDExtendedRequest decodeExtendedRequest( private static final class ResultDecoder extends AbstractExtendedResultDecoder { - /** {@inheritDoc} */ + @Override public GetConnectionIDExtendedResult newExtendedErrorResult(final ResultCode resultCode, final String matchedDN, final String diagnosticMessage) { if (!resultCode.isExceptional()) { @@ -82,6 +83,7 @@ public GetConnectionIDExtendedResult newExtendedErrorResult(final ResultCode res .setDiagnosticMessage(diagnosticMessage); } + @Override public GetConnectionIDExtendedResult decodeExtendedResult(final ExtendedResult result, final DecodeOptions options) throws DecodeException { if (result instanceof GetConnectionIDExtendedResult) { @@ -124,10 +126,7 @@ public GetConnectionIDExtendedResult decodeExtendedResult(final ExtendedResult r private static final GetConnectionIDExtendedRequest INSTANCE = new GetConnectionIDExtendedRequest(); - /** - * A decoder which can be used to decode get connection ID extended - * operation requests. - */ + /** A decoder which can be used to decode get connection ID extended operation requests. */ public static final RequestDecoder REQUEST_DECODER = new RequestDecoder(); /** No need to expose this. */ @@ -147,31 +146,26 @@ private GetConnectionIDExtendedRequest() { // Nothing to do. } - /** {@inheritDoc} */ @Override public String getOID() { return OID; } - /** {@inheritDoc} */ @Override public ExtendedResultDecoder getResultDecoder() { return RESULT_DECODER; } - /** {@inheritDoc} */ @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java index b0f4a6fa1..6b1066a7b 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2014 ForgeRock AS + * Portions copyright 2013-2016 ForgeRock AS */ package com.forgerock.opendj.ldap.extensions; @@ -57,6 +57,7 @@ public final class GetSymmetricKeyExtendedRequest extends private static final class RequestDecoder implements ExtendedRequestDecoder { + @Override public GetSymmetricKeyExtendedRequest decodeExtendedRequest( final ExtendedRequest request, final DecodeOptions options) throws DecodeException { @@ -102,12 +103,14 @@ public GetSymmetricKeyExtendedRequest decodeExtendedRequest( private static final class ResultDecoder extends AbstractExtendedResultDecoder { + @Override public ExtendedResult newExtendedErrorResult(final ResultCode resultCode, final String matchedDN, final String diagnosticMessage) { return Responses.newGenericExtendedResult(resultCode).setMatchedDN(matchedDN) .setDiagnosticMessage(diagnosticMessage); } + @Override public ExtendedResult decodeExtendedResult(final ExtendedResult result, final DecodeOptions options) throws DecodeException { return result; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java index 817ca09e1..61e24746b 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; @@ -34,9 +34,7 @@ import org.forgerock.opendj.ldap.ResultCode; import org.forgerock.opendj.ldap.responses.AbstractExtendedResult; -/** - * The password policy state extended result. - */ +/** The password policy state extended result. */ public final class PasswordPolicyStateExtendedResult extends AbstractExtendedResult implements PasswordPolicyStateOperationContainer { @@ -54,47 +52,42 @@ public PasswordPolicyStateExtendedResult(final ResultCode resultCode) { super(resultCode); } - /** {@inheritDoc} */ + @Override public void addOperation(final PasswordPolicyStateOperation operation) { operations.add(operation); } - /** {@inheritDoc} */ @Override public String getOID() { // No response name defined. return PasswordPolicyStateExtendedRequest.OID; } - /** {@inheritDoc} */ + @Override public Iterable getOperations() { return operations; } - /** {@inheritDoc} */ + @Override public String getTargetUser() { return targetUser; } - /** {@inheritDoc} */ @Override public ByteString getValue() { return PasswordPolicyStateExtendedRequest.encode(targetUser, operations); } - /** {@inheritDoc} */ @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ @Override public void setTargetUser(String targetUser) { this.targetUser = targetUser != null ? targetUser : ""; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java index f6272f646..71e6ca5c0 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java @@ -22,238 +22,155 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; import org.forgerock.opendj.ldap.ByteString; -/** - * Password policy state operation type. - */ +/** Password policy state operation type. */ public enum PasswordPolicyStateOperationType implements PasswordPolicyStateOperation { - /** - * Get password policy DN operation. - */ + /** Get password policy DN operation. */ GET_PASSWORD_POLICY_DN(PasswordPolicyStateExtendedRequest.PASSWORD_POLICY_DN_NAME), - /** - * Get account disabled state operation. - */ + /** Get account disabled state operation. */ GET_ACCOUNT_DISABLED_STATE(PasswordPolicyStateExtendedRequest.ACCOUNT_DISABLED_STATE_NAME), - /** - * Set account disabled state operation. - */ + /** Set account disabled state operation. */ SET_ACCOUNT_DISABLED_STATE(PasswordPolicyStateExtendedRequest.ACCOUNT_DISABLED_STATE_NAME), - /** - * Clear account disabled state operation. - */ + /** Clear account disabled state operation. */ CLEAR_ACCOUNT_DISABLED_STATE(PasswordPolicyStateExtendedRequest.ACCOUNT_DISABLED_STATE_NAME), - /** - * Get account expiration time operation. - */ + /** Get account expiration time operation. */ GET_ACCOUNT_EXPIRATION_TIME(PasswordPolicyStateExtendedRequest.ACCOUNT_EXPIRATION_TIME_NAME), - /** - * Set account expiration time operation. - */ + /** Set account expiration time operation. */ SET_ACCOUNT_EXPIRATION_TIME(PasswordPolicyStateExtendedRequest.ACCOUNT_EXPIRATION_TIME_NAME), - /** - * Clear account expiration time operation. - */ + /** Clear account expiration time operation. */ CLEAR_ACCOUNT_EXPIRATION_TIME(PasswordPolicyStateExtendedRequest.ACCOUNT_EXPIRATION_TIME_NAME), - /** - * Get seconds until account expiration operation. - */ + /** Get seconds until account expiration operation. */ GET_SECONDS_UNTIL_ACCOUNT_EXPIRATION( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_ACCOUNT_EXPIRATION_NAME), - /** - * Get password changed time operation. - */ + /** Get password changed time operation. */ GET_PASSWORD_CHANGED_TIME(PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_TIME_NAME), - /** - * Set password changed time operation. - */ + /** Set password changed time operation. */ SET_PASSWORD_CHANGED_TIME(PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_TIME_NAME), - /** - * Clear password changed time operation. - */ + /** Clear password changed time operation. */ CLEAR_PASSWORD_CHANGED_TIME(PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_TIME_NAME), - /** - * Get password expiration warned time operation. - */ + /** Get password expiration warned time operation. */ GET_PASSWORD_EXPIRATION_WARNED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_EXPIRATION_WARNED_TIME_NAME), - /** - * Set password expiration warned time operation. - */ + /** Set password expiration warned time operation. */ SET_PASSWORD_EXPIRATION_WARNED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_EXPIRATION_WARNED_TIME_NAME), - /** - * Clear password expiration warned time operation. - */ + /** Clear password expiration warned time operation. */ CLEAR_PASSWORD_EXPIRATION_WARNED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_EXPIRATION_WARNED_TIME_NAME), - /** - * Get seconds until password expiration operation. - */ + /** Get seconds until password expiration operation. */ GET_SECONDS_UNTIL_PASSWORD_EXPIRATION( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_PASSWORD_EXPIRATION_NAME), - /** - * Get seconds until password expiration warning operation. - */ + /** Get seconds until password expiration warning operation. */ GET_SECONDS_UNTIL_PASSWORD_EXPIRATION_WARNING( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_PASSWORD_EXPIRATION_WARNING_NAME), - /** - * Get authentication failure times operation. - */ + /** Get authentication failure times operation. */ GET_AUTHENTICATION_FAILURE_TIMES( PasswordPolicyStateExtendedRequest.AUTHENTICATION_FAILURE_TIMES_NAME), - /** - * Add authentication failure times operation. - */ + /** Add authentication failure times operation. */ ADD_AUTHENTICATION_FAILURE_TIMES( PasswordPolicyStateExtendedRequest.AUTHENTICATION_FAILURE_TIMES_NAME), - /** - * Set authentication failure times operation. - */ + /** Set authentication failure times operation. */ SET_AUTHENTICATION_FAILURE_TIMES( PasswordPolicyStateExtendedRequest.AUTHENTICATION_FAILURE_TIMES_NAME), - /** - * Clear authentication failure times operation. - */ + /** Clear authentication failure times operation. */ CLEAR_AUTHENTICATION_FAILURE_TIMES( PasswordPolicyStateExtendedRequest.AUTHENTICATION_FAILURE_TIMES_NAME), - /** - * Get seconds until authentication failure unlock operation. - */ + /** Get seconds until authentication failure unlock operation. */ GET_SECONDS_UNTIL_AUTHENTICATION_FAILURE_UNLOCK( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_AUTHENTICATION_FAILURE_UNLOCK_NAME), - /** - * Get remaining authentication failure count operation. - */ + /** Get remaining authentication failure count operation. */ GET_REMAINING_AUTHENTICATION_FAILURE_COUNT( PasswordPolicyStateExtendedRequest.REMAINING_AUTHENTICATION_FAILURE_COUNT_NAME), - /** - * Get last login time operation. - */ + /** Get last login time operation. */ GET_LAST_LOGIN_TIME(PasswordPolicyStateExtendedRequest.LAST_LOGIN_TIME_NAME), - /** - * Set last login time operation. - */ + /** Set last login time operation. */ SET_LAST_LOGIN_TIME(PasswordPolicyStateExtendedRequest.LAST_LOGIN_TIME_NAME), - /** - * Clear last login time operation. - */ + /** Clear last login time operation. */ CLEAR_LAST_LOGIN_TIME(PasswordPolicyStateExtendedRequest.LAST_LOGIN_TIME_NAME), - /** - * Get seconds until idle lockout operation. - */ + /** Get seconds until idle lockout operation. */ GET_SECONDS_UNTIL_IDLE_LOCKOUT( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_IDLE_LOCKOUT_NAME), - /** - * Get password reset state operation. - */ + /** Get password reset state operation. */ GET_PASSWORD_RESET_STATE(PasswordPolicyStateExtendedRequest.PASSWORD_RESET_STATE_NAME), - /** - * Set password reset state operation. - */ + /** Set password reset state operation. */ SET_PASSWORD_RESET_STATE(PasswordPolicyStateExtendedRequest.PASSWORD_RESET_STATE_NAME), - /** - * Clear password reset state operation. - */ + /** Clear password reset state operation. */ CLEAR_PASSWORD_RESET_STATE(PasswordPolicyStateExtendedRequest.PASSWORD_RESET_STATE_NAME), - /** - * Get seconds until password reset lockout operation. - */ + /** Get seconds until password reset lockout operation. */ GET_SECONDS_UNTIL_PASSWORD_RESET_LOCKOUT( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_PASSWORD_RESET_LOCKOUT_NAME), - /** - * Get grace login use times operation. - */ + /** Get grace login use times operation. */ GET_GRACE_LOGIN_USE_TIMES(PasswordPolicyStateExtendedRequest.GRACE_LOGIN_USE_TIMES_NAME), - /** - * Add grace login use times operation. - */ + /** Add grace login use times operation. */ ADD_GRACE_LOGIN_USE_TIME(PasswordPolicyStateExtendedRequest.GRACE_LOGIN_USE_TIMES_NAME), - /** - * Set grace login use times operation. - */ + /** Set grace login use times operation. */ SET_GRACE_LOGIN_USE_TIMES(PasswordPolicyStateExtendedRequest.GRACE_LOGIN_USE_TIMES_NAME), - /** - * Clear grace login use times operation. - */ + /** Clear grace login use times operation. */ CLEAR_GRACE_LOGIN_USE_TIMES(PasswordPolicyStateExtendedRequest.GRACE_LOGIN_USE_TIMES_NAME), - /** - * Get remaining grace login count operation. - */ + /** Get remaining grace login count operation. */ GET_REMAINING_GRACE_LOGIN_COUNT( PasswordPolicyStateExtendedRequest.REMAINING_GRACE_LOGIN_COUNT_NAME), - /** - * Get password changed by required time operation. - */ + /** Get password changed by required time operation. */ GET_PASSWORD_CHANGED_BY_REQUIRED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_BY_REQUIRED_TIME_NAME), - /** - * Set password changed by required time operation. - */ + /** Set password changed by required time operation. */ SET_PASSWORD_CHANGED_BY_REQUIRED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_BY_REQUIRED_TIME_NAME), - /** - * Clear password changed by required time operation. - */ + /** Clear password changed by required time operation. */ CLEAR_PASSWORD_CHANGED_BY_REQUIRED_TIME( PasswordPolicyStateExtendedRequest.PASSWORD_CHANGED_BY_REQUIRED_TIME_NAME), - /** - * Get seconds until required change time operation. - */ + /** Get seconds until required change time operation. */ GET_SECONDS_UNTIL_REQUIRED_CHANGE_TIME( PasswordPolicyStateExtendedRequest.SECONDS_UNTIL_REQUIRED_CHANGE_TIME_NAME), - /** - * Get password history operation. - */ + /** Get password history operation. */ GET_PASSWORD_HISTORY(PasswordPolicyStateExtendedRequest.PASSWORD_HISTORY_NAME), - /** - * Clear password history operation. - */ + /** Clear password history operation. */ CLEAR_PASSWORD_HISTORY(PasswordPolicyStateExtendedRequest.PASSWORD_HISTORY_NAME); private String propertyName; @@ -262,17 +179,16 @@ private PasswordPolicyStateOperationType(final String propertyName) { this.propertyName = propertyName; } - /** {@inheritDoc} */ + @Override public PasswordPolicyStateOperationType getOperationType() { return this; } - /** {@inheritDoc} */ + @Override public Iterable getValues() { return null; } - /** {@inheritDoc} */ @Override public String toString() { return propertyName; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java index 2bb063a0d..831f23f92 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package com.forgerock.opendj.util; @@ -180,7 +180,7 @@ public char charValue() { return c; } - /** {@inheritDoc} */ + @Override public int compareTo(final ASCIICharProp o) { return c - o.c; } @@ -196,13 +196,11 @@ public int decimalValue() { return decimalValue; } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { return this == obj; } - /** {@inheritDoc} */ @Override public int hashCode() { return c; @@ -309,7 +307,6 @@ public char toLowerCase() { return lowerCaseChar; } - /** {@inheritDoc} */ @Override public String toString() { return stringValue; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java index a3fd595c3..dce8c8a73 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java @@ -22,9 +22,8 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ - package com.forgerock.opendj.util; import java.util.Iterator; @@ -33,9 +32,7 @@ import org.forgerock.util.Function; import org.forgerock.util.promise.NeverThrowsException; -/** - * Utility methods for manipulating {@link Iterator}s. - */ +/** Utility methods for manipulating {@link Iterator}s. */ public final class Iterators { private static final class ArrayIterator implements Iterator { private int i; @@ -46,12 +43,12 @@ private ArrayIterator(final M[] a) { this.a = a; } - /** {@inheritDoc} */ + @Override public boolean hasNext() { return i < a.length; } - /** {@inheritDoc} */ + @Override public M next() { if (hasNext()) { return a[i++]; @@ -60,7 +57,7 @@ public M next() { } } - /** {@inheritDoc} */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -68,17 +65,17 @@ public void remove() { } private static final class EmptyIterator implements Iterator { - /** {@inheritDoc} */ + @Override public boolean hasNext() { return false; } - /** {@inheritDoc} */ + @Override public M next() { throw new NoSuchElementException(); } - /** {@inheritDoc} */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -101,7 +98,7 @@ private FilteredIterator(final Iterator iterator, this.parameter = p; } - /** {@inheritDoc} */ + @Override public boolean hasNext() { if (hasNextMustIterate) { hasNextMustIterate = false; @@ -118,7 +115,7 @@ public boolean hasNext() { } } - /** {@inheritDoc} */ + @Override public M next() { if (!hasNext()) { throw new NoSuchElementException(); @@ -127,7 +124,7 @@ public M next() { return next; } - /** {@inheritDoc} */ + @Override public void remove() { iterator.remove(); } @@ -142,12 +139,12 @@ private SingletonIterator(final M value) { this.value = value; } - /** {@inheritDoc} */ + @Override public boolean hasNext() { return value != null; } - /** {@inheritDoc} */ + @Override public M next() { if (value != null) { final M tmp = value; @@ -158,7 +155,7 @@ public M next() { } } - /** {@inheritDoc} */ + @Override public void remove() { throw new UnsupportedOperationException(); } @@ -177,17 +174,17 @@ private TransformedIterator(final Iterator iterator, this.function = function; } - /** {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } - /** {@inheritDoc} */ + @Override public N next() { return function.apply(iterator.next()); } - /** {@inheritDoc} */ + @Override public void remove() { iterator.remove(); } @@ -201,17 +198,17 @@ private UnmodifiableIterator(final Iterator iterator) { this.iterator = iterator; } - /** {@inheritDoc} */ + @Override public boolean hasNext() { return iterator.hasNext(); } - /** {@inheritDoc} */ + @Override public M next() { return iterator.next(); } - /** {@inheritDoc} */ + @Override public void remove() { throw new UnsupportedOperationException(); } diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java index 7e8ff6391..705499f28 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.util; @@ -118,6 +118,7 @@ private OperatingSystem(String osName, boolean isWindows, boolean isMacOS, boole * * @return The human-readable name for this operating system. */ + @Override public String toString() { return osName; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java index eb6c0e8dd..4a8dec001 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.io; @@ -41,9 +41,7 @@ import com.forgerock.opendj.util.SizeLimitInputStream; -/** - * An ASN1Reader that reads from an input stream. - */ +/** An ASN1Reader that reads from an input stream. */ final class ASN1InputStreamReader extends AbstractASN1Reader { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); @@ -72,14 +70,14 @@ final class ASN1InputStreamReader extends AbstractASN1Reader { this.maxElementSize = maxElementSize; } - /** {@inheritDoc} */ + @Override public void close() throws IOException { // Calling close of SizeLimitInputStream should close the parent stream. in.close(); streamStack.clear(); } - /** {@inheritDoc} */ + @Override public boolean elementAvailable() throws IOException { return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(false, false)) && (state != ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE || needFirstLengthByteState(false, false)) @@ -88,7 +86,7 @@ public boolean elementAvailable() throws IOException { && peekLength <= in.available(); } - /** {@inheritDoc} */ + @Override public boolean hasNextElement() throws IOException { if (!streamStack.isEmpty()) { // We are reading a sub sequence. Return true as long as we @@ -101,7 +99,7 @@ public boolean hasNextElement() throws IOException { return state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true, false); } - /** {@inheritDoc} */ + @Override public int peekLength() throws IOException { peekType(); switch (state) { @@ -117,7 +115,7 @@ public int peekLength() throws IOException { return peekLength; } - /** {@inheritDoc} */ + @Override public byte peekType() throws IOException { if (state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) { needTypeState(true, true); @@ -126,7 +124,7 @@ public byte peekType() throws IOException { return peekType; } - /** {@inheritDoc} */ + @Override public boolean readBoolean() throws IOException { // Read the header if haven't done so already peekLength(); @@ -148,7 +146,7 @@ public boolean readBoolean() throws IOException { return readByte != 0x00; } - /** {@inheritDoc} */ + @Override public void readEndSequence() throws IOException { if (streamStack.isEmpty()) { final LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get(); @@ -171,20 +169,19 @@ public void readEndSequence() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ @Override public void readEndExplicitTag() throws DecodeException, IOException { readEndSequence(); } - /** {@inheritDoc} */ + @Override public void readEndSet() throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. readEndSequence(); } - /** {@inheritDoc} */ + @Override public int readEnumerated() throws IOException { // Read the header if haven't done so already peekLength(); @@ -199,7 +196,7 @@ public int readEnumerated() throws IOException { return (int) readInteger(); } - /** {@inheritDoc} */ + @Override public long readInteger() throws IOException { // Read the header if haven't done so already peekLength(); @@ -248,7 +245,7 @@ public long readInteger() throws IOException { } } - /** {@inheritDoc} */ + @Override public void readNull() throws IOException { // Read the header if haven't done so already peekLength(); @@ -264,7 +261,7 @@ public void readNull() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ + @Override public ByteString readOctetString() throws IOException { // Read the header if haven't done so already peekLength(); @@ -295,7 +292,7 @@ public ByteString readOctetString() throws IOException { return ByteString.wrap(value); } - /** {@inheritDoc} */ + @Override public ByteStringBuilder readOctetString(final ByteStringBuilder builder) throws IOException { // Read the header if haven't done so already peekLength(); @@ -323,7 +320,7 @@ public ByteStringBuilder readOctetString(final ByteStringBuilder builder) throws return builder; } - /** {@inheritDoc} */ + @Override public String readOctetStringAsString() throws IOException { // Read the header if haven't done so already peekLength(); @@ -365,7 +362,7 @@ public String readOctetStringAsString() throws IOException { return str; } - /** {@inheritDoc} */ + @Override public void readStartSequence() throws IOException { // Read the header if haven't done so already peekLength(); @@ -381,20 +378,19 @@ public void readStartSequence() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ @Override public void readStartExplicitTag() throws DecodeException, IOException { readStartSequence(); } - /** {@inheritDoc} */ + @Override public void readStartSet() throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. readStartSequence(); } - /** {@inheritDoc} */ + @Override public ASN1Reader skipElement() throws IOException { // Read the header if haven't done so already peekLength(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java index e270b6bef..67ba8caae 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. * Portions Copyright 2014 Manuel Gaupp */ @@ -49,6 +49,7 @@ public interface ASN1Reader extends Closeable { * @throws IOException * If an error occurs while closing. */ + @Override void close() throws IOException; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java index 7c869a269..5353d4a25 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.io; @@ -48,6 +48,7 @@ public interface ASN1Writer extends Closeable, Flushable { * @throws IOException * If an error occurs while closing. */ + @Override void close() throws IOException; /** @@ -65,6 +66,7 @@ public interface ASN1Writer extends Closeable, Flushable { * @throws IOException * If an error occurs while flushing. */ + @Override void flush() throws IOException; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java index ef83c990c..f0a95b473 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. * Portions Copyright 2014 Manuel Gaupp */ @@ -42,14 +42,12 @@ * implementing new ASN1 reader implementations. */ public abstract class AbstractASN1Reader implements ASN1Reader { - /** - * Creates a new abstract ASN.1 reader. - */ + /** Creates a new abstract ASN.1 reader. */ protected AbstractASN1Reader() { // No implementation required. } - /** {@inheritDoc} */ + @Override public boolean readBoolean(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_BOOLEAN_TYPE; @@ -58,7 +56,7 @@ public boolean readBoolean(byte type) throws IOException { return readBoolean(); } - /** {@inheritDoc} */ + @Override public int readEnumerated(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_ENUMERATED_TYPE; @@ -67,7 +65,7 @@ public int readEnumerated(byte type) throws IOException { return readEnumerated(); } - /** {@inheritDoc} */ + @Override public long readInteger(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_INTEGER_TYPE; @@ -76,7 +74,7 @@ public long readInteger(byte type) throws IOException { return readInteger(); } - /** {@inheritDoc} */ + @Override public void readNull(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_NULL_TYPE; @@ -85,7 +83,7 @@ public void readNull(byte type) throws IOException { readNull(); } - /** {@inheritDoc} */ + @Override public ByteString readOctetString(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_OCTET_STRING_TYPE; @@ -94,7 +92,7 @@ public ByteString readOctetString(byte type) throws IOException { return readOctetString(); } - /** {@inheritDoc} */ + @Override public ByteStringBuilder readOctetString(byte type, final ByteStringBuilder builder) throws IOException { if (type == 0x00) { @@ -105,7 +103,7 @@ public ByteStringBuilder readOctetString(byte type, final ByteStringBuilder buil return builder; } - /** {@inheritDoc} */ + @Override public String readOctetStringAsString(byte type) throws IOException { // We could cache the UTF-8 CharSet if performance proves to be an // issue. @@ -116,7 +114,7 @@ public String readOctetStringAsString(byte type) throws IOException { return readOctetStringAsString(); } - /** {@inheritDoc} */ + @Override public void readStartExplicitTag(byte type) throws IOException { if (type == 0x00) { type = (ASN1.TYPE_MASK_CONTEXT | ASN1.TYPE_MASK_CONSTRUCTED); @@ -125,7 +123,7 @@ public void readStartExplicitTag(byte type) throws IOException { readStartExplicitTag(); } - /** {@inheritDoc} */ + @Override public void readStartSequence(byte type) throws IOException { if (type == 0x00) { type = ASN1.UNIVERSAL_SEQUENCE_TYPE; @@ -134,7 +132,7 @@ public void readStartSequence(byte type) throws IOException { readStartSequence(); } - /** {@inheritDoc} */ + @Override public void readStartSet(byte type) throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. @@ -145,7 +143,7 @@ public void readStartSet(byte type) throws IOException { readStartSet(); } - /** {@inheritDoc} */ + @Override public ASN1Reader skipElement(final byte expectedType) throws IOException { if (peekType() != expectedType) { final LocalizableMessage message = diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java index caefb70f6..4c994428f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.io; @@ -36,70 +36,68 @@ */ public abstract class AbstractASN1Writer implements ASN1Writer { - /** - * Creates a new abstract ASN.1 writer. - */ + /** Creates a new abstract ASN.1 writer. */ protected AbstractASN1Writer() { // No implementation required. } - /** {@inheritDoc} */ + @Override public ASN1Writer writeBoolean(final boolean value) throws IOException { return writeBoolean(ASN1.UNIVERSAL_BOOLEAN_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeEnumerated(final int value) throws IOException { return writeEnumerated(ASN1.UNIVERSAL_ENUMERATED_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeInteger(final int value) throws IOException { return writeInteger(ASN1.UNIVERSAL_INTEGER_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeInteger(final long value) throws IOException { return writeInteger(ASN1.UNIVERSAL_INTEGER_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeNull() throws IOException { return writeNull(ASN1.UNIVERSAL_NULL_TYPE); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(byte type, byte[] value) throws IOException { return writeOctetString(type, value, 0, value.length); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(byte[] value) throws IOException { return writeOctetString(value, 0, value.length); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final byte[] value, final int offset, final int length) throws IOException { return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value, offset, length); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final ByteSequence value) throws IOException { return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final String value) throws IOException { return writeOctetString(ASN1.UNIVERSAL_OCTET_STRING_TYPE, value); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeStartSequence() throws IOException { return writeStartSequence(ASN1.UNIVERSAL_SEQUENCE_TYPE); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeStartSet() throws IOException { return writeStartSet(ASN1.UNIVERSAL_SET_TYPE); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java index a21098a27..4cc4ebe42 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java @@ -22,9 +22,8 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.AbstractSet; @@ -140,18 +139,15 @@ static String toString(final Attribute attribute) { return builder.toString(); } - /** - * Sole constructor. - */ + /** Sole constructor. */ protected AbstractAttribute() { // No implementation required. } - /** {@inheritDoc} */ @Override public abstract boolean add(ByteString value); - /** {@inheritDoc} */ + @Override public boolean add(final Object... values) { Reject.ifNull(values); boolean modified = false; @@ -161,13 +157,12 @@ public boolean add(final Object... values) { return modified; } - /** {@inheritDoc} */ @Override public boolean addAll(final Collection values) { return addAll(values, null); } - /** {@inheritDoc} */ + @Override public boolean addAll(final Collection values, final Collection duplicateValues) { boolean modified = false; @@ -181,11 +176,9 @@ public boolean addAll(final Collection values, return modified; } - /** {@inheritDoc} */ @Override public abstract boolean contains(Object value); - /** {@inheritDoc} */ @Override public boolean containsAll(final Collection values) { for (final Object value : values) { @@ -196,56 +189,51 @@ public boolean containsAll(final Collection values) { return true; } - /** {@inheritDoc} */ @Override public boolean equals(final Object object) { return equals(this, object); } - /** {@inheritDoc} */ + @Override public ByteString firstValue() { return iterator().next(); } - /** {@inheritDoc} */ + @Override public String firstValueAsString() { return firstValue().toString(); } - /** {@inheritDoc} */ + @Override public abstract AttributeDescription getAttributeDescription(); - /** {@inheritDoc} */ + @Override public String getAttributeDescriptionAsString() { return getAttributeDescription().toString(); } - /** {@inheritDoc} */ @Override public int hashCode() { return hashCode(this); } - /** {@inheritDoc} */ + @Override public AttributeParser parse() { return AttributeParser.parseAttribute(this); } - /** {@inheritDoc} */ @Override public abstract Iterator iterator(); - /** {@inheritDoc} */ @Override public abstract boolean remove(Object value); - /** {@inheritDoc} */ @Override public boolean removeAll(final Collection values) { return removeAll(values, null); } - /** {@inheritDoc} */ + @Override public boolean removeAll(final Collection values, final Collection missingValues) { boolean modified = false; @@ -259,13 +247,12 @@ public boolean removeAll(final Collection values, return modified; } - /** {@inheritDoc} */ @Override public boolean retainAll(final Collection values) { return retainAll(values, null); } - /** {@inheritDoc} */ + @Override public boolean retainAll(final Collection values, final Collection missingValues) { if (values.isEmpty()) { @@ -307,17 +294,14 @@ public boolean retainAll(final Collection values, return modified; } - /** {@inheritDoc} */ @Override public abstract int size(); - /** {@inheritDoc} */ @Override public ByteString[] toArray() { return toArray(new ByteString[size()]); } - /** {@inheritDoc} */ @Override public String toString() { return toString(this); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java index 731a5acf7..d771f1a19 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -57,6 +58,7 @@ protected AbstractFilterVisitor() { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitAndFilter(final P p, final List subFilters) { return visitDefaultFilter(p); } @@ -66,6 +68,7 @@ public R visitAndFilter(final P p, final List subFilters) { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitApproxMatchFilter(final P p, final String attributeDescription, final ByteString assertionValue) { return visitDefaultFilter(p); @@ -90,6 +93,7 @@ public R visitDefaultFilter(final P p) { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitEqualityMatchFilter(final P p, final String attributeDescription, final ByteString assertionValue) { return visitDefaultFilter(p); @@ -100,6 +104,7 @@ public R visitEqualityMatchFilter(final P p, final String attributeDescription, *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitExtensibleMatchFilter(final P p, final String matchingRule, final String attributeDescription, final ByteString assertionValue, final boolean dnAttributes) { @@ -111,6 +116,7 @@ public R visitExtensibleMatchFilter(final P p, final String matchingRule, *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitGreaterOrEqualFilter(final P p, final String attributeDescription, final ByteString assertionValue) { return visitDefaultFilter(p); @@ -121,6 +127,7 @@ public R visitGreaterOrEqualFilter(final P p, final String attributeDescription, *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitLessOrEqualFilter(final P p, final String attributeDescription, final ByteString assertionValue) { return visitDefaultFilter(p); @@ -131,6 +138,7 @@ public R visitLessOrEqualFilter(final P p, final String attributeDescription, *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitNotFilter(final P p, final Filter subFilter) { return visitDefaultFilter(p); } @@ -140,6 +148,7 @@ public R visitNotFilter(final P p, final Filter subFilter) { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitOrFilter(final P p, final List subFilters) { return visitDefaultFilter(p); } @@ -149,6 +158,7 @@ public R visitOrFilter(final P p, final List subFilters) { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitPresentFilter(final P p, final String attributeDescription) { return visitDefaultFilter(p); } @@ -158,6 +168,7 @@ public R visitPresentFilter(final P p, final String attributeDescription) { *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitSubstringsFilter(final P p, final String attributeDescription, final ByteString initialSubstring, final List anySubstrings, final ByteString finalSubstring) { @@ -169,6 +180,7 @@ public R visitSubstringsFilter(final P p, final String attributeDescription, *

* The default implementation is to call {@link #visitDefaultFilter(Object)}. */ + @Override public R visitUnrecognizedFilter(final P p, final byte filterTag, final ByteString filterBytes) { return visitDefaultFilter(p); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java index ae31be17b..87163803a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -60,6 +60,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code value} was {@code null}. */ + @Override boolean add(ByteString value); /** @@ -99,6 +100,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code values} was {@code null}. */ + @Override boolean addAll(Collection values); /** @@ -134,6 +136,7 @@ public interface Attribute extends Set { * If this attribute does not support removal of attribute * values. */ + @Override void clear(); /** @@ -150,6 +153,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code value} was {@code null}. */ + @Override boolean contains(Object value); /** @@ -167,6 +171,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code values} was {@code null}. */ + @Override boolean containsAll(Collection values); /** @@ -181,6 +186,7 @@ public interface Attribute extends Set { * @return {@code true} if {@code object} is an attribute which is equal to * this attribute, or {@code false} if not. */ + @Override boolean equals(Object object); /** @@ -226,6 +232,7 @@ public interface Attribute extends Set { * * @return The hash code for this attribute. */ + @Override int hashCode(); /** @@ -233,6 +240,7 @@ public interface Attribute extends Set { * * @return {@code true} if this attribute contains no attribute values. */ + @Override boolean isEmpty(); /** @@ -242,6 +250,7 @@ public interface Attribute extends Set { * * @return An iterator over the attribute values in this attribute. */ + @Override Iterator iterator(); /** @@ -269,6 +278,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code value} was {@code null}. */ + @Override boolean remove(Object value); /** @@ -293,6 +303,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code values} was {@code null}. */ + @Override boolean removeAll(Collection values); /** @@ -342,6 +353,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code values} was {@code null}. */ + @Override boolean retainAll(Collection values); /** @@ -373,6 +385,7 @@ public interface Attribute extends Set { * * @return The number of attribute values in this attribute. */ + @Override int size(); /** @@ -390,6 +403,7 @@ public interface Attribute extends Set { * @return An array containing all of the attribute values contained in this * attribute. */ + @Override ByteString[] toArray(); /** @@ -421,6 +435,7 @@ public interface Attribute extends Set { * @throws NullPointerException * If {@code array} was {@code null}. */ + @Override T[] toArray(T[] array); /** @@ -428,5 +443,6 @@ public interface Attribute extends Set { * * @return The string representation of this attribute. */ + @Override String toString(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java index bb650f063..595513ad8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -84,7 +84,6 @@ protected Impl() { public abstract boolean isSuperTypeOf(Impl other); public abstract int size(); - } private static final class MultiOptionImpl extends Impl { @@ -175,9 +174,7 @@ public boolean isSubTypeOf(final Impl other) { return false; } else { // Check this contains other's options. - // - // This could be optimized more if required, but it's probably - // not worth it. + // This could be optimized more if required, but it's probably not worth it. final MultiOptionImpl tmp = (MultiOptionImpl) other; for (final String normalizedOption : tmp.normalizedOptions) { if (!hasOption(normalizedOption)) { @@ -199,6 +196,7 @@ public boolean isSuperTypeOf(final Impl other) { return true; } + @Override public Iterator iterator() { return Iterators.arrayIterator(options); } @@ -272,6 +270,7 @@ public boolean isSuperTypeOf(final Impl other) { return other.hasOption(normalizedOption); } + @Override public Iterator iterator() { return Iterators.singletonIterator(option); } @@ -333,6 +332,7 @@ public boolean isSuperTypeOf(final Impl other) { return true; } + @Override public Iterator iterator() { return Iterators.emptyIterator(); } @@ -347,7 +347,6 @@ public int size() { private static final ThreadLocal>> CACHE = new ThreadLocal>>() { - /** {@inheritDoc} */ @Override protected WeakHashMap> initialValue() { return new WeakHashMap<>(); @@ -1004,6 +1003,7 @@ private AttributeDescription(final String attributeDescription, * @throws NullPointerException * If {@code name} was {@code null}. */ + @Override public int compareTo(final AttributeDescription other) { final int result = attributeType.compareTo(other.attributeType); if (result != 0) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java index 079391787..57c5c2847 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -101,11 +102,7 @@ private DecodeException(final LocalizableMessage message, final boolean isFatal, this.isFatal = isFatal; } - /** - * Returns the message that explains the problem that occurred. - * - * @return LocalizableMessage of the problem - */ + @Override public LocalizableMessage getMessageObject() { return message; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java index 1a4ae12d5..2d62cfe49 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -52,17 +52,14 @@ private FixedSchemaResolver(final Schema schema) { this.schema = schema; } - /** {@inheritDoc} */ + @Override public Schema resolveSchema(final String dn) { return schema; } - } private SchemaResolver schemaResolver; - private EntryFactory entryFactory; - private AttributeFactory attributeFactory; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java index 45cd6e1af..f3d461158 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -232,6 +232,7 @@ public interface Entry { * @return {@code true} if {@code object} is an entry which is equal to this * entry, or {@code false} if not. */ + @Override boolean equals(Object object); /** @@ -330,6 +331,7 @@ public interface Entry { * * @return The hash code for this entry. */ + @Override int hashCode(); /** @@ -525,5 +527,6 @@ public interface Entry { * * @return The string representation of this entry. */ + @Override String toString(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java index 9c14ca1ac..8cedfa84a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -50,6 +50,7 @@ public final class Functions { private static final Function BYTESTRING_TO_STRING = new Function() { + @Override public String apply(final ByteString value) { return value.toString(); } @@ -57,6 +58,7 @@ public String apply(final ByteString value) { private static final Function IDENTITY = new Function() { + @Override public Object apply(final Object value) { return value; } @@ -64,6 +66,7 @@ public Object apply(final Object value) { private static final Function NORMALIZE_STRING = new Function() { + @Override public String apply(final String value) { return StaticUtils.toLowerCase(value).trim(); } @@ -71,6 +74,7 @@ public String apply(final String value) { private static final Function OBJECT_TO_BYTESTRING = new Function() { + @Override public ByteString apply(final Object value) { return ByteString.valueOfObject(value); } @@ -78,6 +82,7 @@ public ByteString apply(final Object value) { private static final Function STRING_TO_BOOLEAN = new Function() { + @Override public Boolean apply(final String value) { final String valueString = StaticUtils.toLowerCase(value); if ("true".equals(valueString) || "yes".equals(valueString) @@ -95,6 +100,7 @@ public Boolean apply(final String value) { private static final Function STRING_TO_GENERALIZED_TIME = new Function() { + @Override public GeneralizedTime apply(final String value) { return GeneralizedTime.valueOf(value); } @@ -102,6 +108,7 @@ public GeneralizedTime apply(final String value) { private static final Function STRING_TO_INTEGER = new Function() { + @Override public Integer apply(final String value) { try { return Integer.valueOf(value); @@ -114,6 +121,7 @@ public Integer apply(final String value) { private static final Function STRING_TO_LONG = new Function() { + @Override public Long apply(final String value) { try { return Long.valueOf(value); @@ -176,6 +184,7 @@ public N apply(M value) { public static Function compose( final Function first, final Function second) { return new Function() { + @Override public N apply(final M value) { return second.apply(first.apply(value)); } @@ -241,6 +250,7 @@ public static Function strin public static Function stringToAttributeDescription( final Schema schema) { return new Function() { + @Override public AttributeDescription apply(final String value) { return AttributeDescription.valueOf(value, schema); } @@ -281,6 +291,7 @@ public static Function stringToDN() { */ public static Function stringToDN(final Schema schema) { return new Function() { + @Override public DN apply(final String value) { return DN.valueOf(value, schema); } @@ -340,6 +351,7 @@ public static Function b public static Function byteStringToAttributeDescription( final Schema schema) { return compose(byteStringToString(), new Function() { + @Override public AttributeDescription apply(final String value) { return AttributeDescription.valueOf(value, schema); } @@ -380,6 +392,7 @@ public static Function byteStringToDN() { */ public static Function byteStringToDN(final Schema schema) { return compose(byteStringToString(), new Function() { + @Override public DN apply(final String value) { return DN.valueOf(value, schema); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java index 482f03eee..d11fea232 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -46,9 +46,7 @@ import org.forgerock.util.Reject; -/** - * This class contains methods for creating common types of key manager. - */ +/** This class contains methods for creating common types of key manager. */ public final class KeyManagers { /** * This class implements an X.509 key manager that will be used to wrap an @@ -66,7 +64,7 @@ private SelectCertificate(final X509KeyManager keyManager, final String alias) { this.alias = alias; } - /** {@inheritDoc} */ + @Override public String chooseClientAlias(final String[] keyType, final Principal[] issuers, final Socket socket) { for (final String type : keyType) { @@ -83,7 +81,6 @@ public String chooseClientAlias(final String[] keyType, final Principal[] issuer return null; } - /** {@inheritDoc} */ @Override public String chooseEngineClientAlias(final String[] keyType, final Principal[] issuers, final SSLEngine engine) { @@ -101,7 +98,6 @@ public String chooseEngineClientAlias(final String[] keyType, final Principal[] return null; } - /** {@inheritDoc} */ @Override public String chooseEngineServerAlias(final String keyType, final Principal[] issuers, final SSLEngine engine) { @@ -117,7 +113,7 @@ public String chooseEngineServerAlias(final String keyType, final Principal[] is return null; } - /** {@inheritDoc} */ + @Override public String chooseServerAlias(final String keyType, final Principal[] issuers, final Socket socket) { final String[] serverAliases = keyManager.getServerAliases(keyType, issuers); @@ -132,22 +128,22 @@ public String chooseServerAlias(final String keyType, final Principal[] issuers, return null; } - /** {@inheritDoc} */ + @Override public X509Certificate[] getCertificateChain(final String alias) { return keyManager.getCertificateChain(alias); } - /** {@inheritDoc} */ + @Override public String[] getClientAliases(final String keyType, final Principal[] issuers) { return keyManager.getClientAliases(keyType, issuers); } - /** {@inheritDoc} */ + @Override public PrivateKey getPrivateKey(final String alias) { return keyManager.getPrivateKey(alias); } - /** {@inheritDoc} */ + @Override public String[] getServerAliases(final String keyType, final Principal[] issuers) { return keyManager.getServerAliases(keyType, issuers); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java index 310d09cf0..8101f51c8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -66,6 +66,7 @@ public final class LinkedHashMapEntry extends AbstractMapEntry { * An entry factory which can be used to create new linked hash map entries. */ public static final EntryFactory FACTORY = new EntryFactory() { + @Override public Entry newEntry(final DN name) { return new LinkedHashMapEntry(name); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java index b8a846121..ed25c2b8b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -219,6 +219,7 @@ public ConditionResult matches(final Entry entry) { * A visitor which is used to transform a filter into a matcher. */ private static final class Visitor implements FilterVisitor { + @Override public MatcherImpl visitAndFilter(final Schema schema, final List subFilters) { if (subFilters.isEmpty()) { logger.trace(LocalizableMessage.raw("Empty add filter component. Will always return TRUE")); @@ -232,6 +233,7 @@ public MatcherImpl visitAndFilter(final Schema schema, final List subFil return new AndMatcherImpl(subMatchers); } + @Override public MatcherImpl visitApproxMatchFilter(final Schema schema, final String attributeDescription, final ByteString assertionValue) { final AttributeDescription ad; @@ -263,6 +265,7 @@ public MatcherImpl visitApproxMatchFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, null, assertion, false); } + @Override public MatcherImpl visitEqualityMatchFilter(final Schema schema, final String attributeDescription, final ByteString assertionValue) { final AttributeDescription ad; @@ -294,6 +297,7 @@ public MatcherImpl visitEqualityMatchFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, null, assertion, false); } + @Override public MatcherImpl visitExtensibleMatchFilter(final Schema schema, final String matchingRule, final String attributeDescription, final ByteString assertionValue, final boolean dnAttributes) { @@ -369,6 +373,7 @@ public MatcherImpl visitExtensibleMatchFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, ruleUse, assertion, dnAttributes); } + @Override public MatcherImpl visitGreaterOrEqualFilter(final Schema schema, final String attributeDescription, final ByteString assertionValue) { final AttributeDescription ad; @@ -401,6 +406,7 @@ public MatcherImpl visitGreaterOrEqualFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, null, assertion, false); } + @Override public MatcherImpl visitLessOrEqualFilter(final Schema schema, final String attributeDescription, final ByteString assertionValue) { final AttributeDescription ad; @@ -432,11 +438,13 @@ public MatcherImpl visitLessOrEqualFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, null, assertion, false); } + @Override public MatcherImpl visitNotFilter(final Schema schema, final Filter subFilter) { final MatcherImpl subMatcher = subFilter.accept(this, schema); return new NotMatcherImpl(subMatcher); } + @Override public MatcherImpl visitOrFilter(final Schema schema, final List subFilters) { if (subFilters.isEmpty()) { logger.trace(LocalizableMessage.raw("Empty or filter component. Will always return FALSE")); @@ -450,6 +458,7 @@ public MatcherImpl visitOrFilter(final Schema schema, final List subFilt return new OrMatcherImpl(subMatchers); } + @Override public MatcherImpl visitPresentFilter(final Schema schema, final String attributeDescription) { AttributeDescription ad; try { @@ -464,6 +473,7 @@ public MatcherImpl visitPresentFilter(final Schema schema, final String attribut return new PresentMatcherImpl(ad); } + @Override public MatcherImpl visitSubstringsFilter(final Schema schema, final String attributeDescription, final ByteString initialSubstring, final List anySubstrings, final ByteString finalSubstring) { @@ -496,6 +506,7 @@ public MatcherImpl visitSubstringsFilter(final Schema schema, return new AssertionMatcherImpl(ad, rule, null, assertion, false); } + @Override public MatcherImpl visitUnrecognizedFilter(final Schema schema, final byte filterTag, final ByteString filterBytes) { // TODO: I18N diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java index adb3d7a48..3d5a7306d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -47,7 +47,7 @@ public interface SchemaResolver { * returned by {@link Schema#getDefaultSchema()}. */ SchemaResolver DEFAULT = new SchemaResolver() { - + @Override public Schema resolveSchema(String dn) { return Schema.getDefaultSchema(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java index dd7217e9e..601d6caa4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -80,6 +80,7 @@ private CompositeEntryComparator(final List> comparators) { this.comparators = comparators; } + @Override public int compare(final Entry entry1, final Entry entry2) { for (final Comparator comparator : comparators) { final int result = comparator.compare(entry1, entry2); @@ -111,6 +112,7 @@ private EntryComparator(final AttributeDescription attributeDescription, * We must use the lowest available value in both entries and missing * attributes sort last. */ + @Override public int compare(final Entry entry1, final Entry entry2) { // Find and normalize the lowest value attribute in each entry. final ByteString normalizedValue1 = lowestValueOf(entry1); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java index fd8e290a6..ae47f0b51 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -69,6 +69,7 @@ public final class TreeMapEntry extends AbstractMapEntry { * An entry factory which can be used to create new tree map entries. */ public static final EntryFactory FACTORY = new EntryFactory() { + @Override public Entry newEntry(final DN name) { return new TreeMapEntry(name); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java index 4791d7618..2ce0075ab 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java @@ -22,9 +22,8 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.io.File; @@ -48,9 +47,7 @@ import org.forgerock.opendj.ldap.schema.Schema; import org.forgerock.util.Reject; -/** - * This class contains methods for creating common types of trust manager. - */ +/** This class contains methods for creating common types of trust manager. */ public final class TrustManagers { /** @@ -68,21 +65,21 @@ private CheckHostName(final X509TrustManager trustManager, final String hostName this.hostNamePattern = hostNamePattern; } - /** {@inheritDoc} */ + @Override public void checkClientTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { verifyHostName(chain); trustManager.checkClientTrusted(chain, authType); } - /** {@inheritDoc} */ + @Override public void checkServerTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { verifyHostName(chain); trustManager.checkServerTrusted(chain, authType); } - /** {@inheritDoc} */ + @Override public X509Certificate[] getAcceptedIssuers() { return trustManager.getAcceptedIssuers(); } @@ -134,10 +131,7 @@ private void verifyHostName(final X509Certificate[] chain) { } } - /** - * An X509TrustManager which rejects certificates which have expired or are - * not yet valid. - */ + /** An X509TrustManager which rejects certificates which have expired or are not yet valid. */ private static final class CheckValidityDates implements X509TrustManager { private final X509TrustManager trustManager; @@ -146,21 +140,21 @@ private CheckValidityDates(final X509TrustManager trustManager) { this.trustManager = trustManager; } - /** {@inheritDoc} */ + @Override public void checkClientTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { verifyExpiration(chain); trustManager.checkClientTrusted(chain, authType); } - /** {@inheritDoc} */ + @Override public void checkServerTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { verifyExpiration(chain); trustManager.checkServerTrusted(chain, authType); } - /** {@inheritDoc} */ + @Override public X509Certificate[] getAcceptedIssuers() { return trustManager.getAcceptedIssuers(); } @@ -187,9 +181,7 @@ private void verifyExpiration(final X509Certificate[] chain) throws CertificateE } } - /** - * An X509TrustManager which does not trust any certificates. - */ + /** An X509TrustManager which does not trust any certificates. */ private static final class DistrustAll implements X509TrustManager { /** Single instance. */ private static final DistrustAll INSTANCE = new DistrustAll(); @@ -199,27 +191,25 @@ private DistrustAll() { // Nothing to do. } - /** {@inheritDoc} */ + @Override public void checkClientTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { throw new CertificateException(); } - /** {@inheritDoc} */ + @Override public void checkServerTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { throw new CertificateException(); } - /** {@inheritDoc} */ + @Override public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } } - /** - * An X509TrustManager which trusts all certificates. - */ + /** An X509TrustManager which trusts all certificates. */ private static final class TrustAll implements X509TrustManager { /** Single instance. */ @@ -230,17 +220,17 @@ private TrustAll() { // Nothing to do. } - /** {@inheritDoc} */ + @Override public void checkClientTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { } - /** {@inheritDoc} */ + @Override public void checkServerTrusted(final X509Certificate[] chain, final String authType) throws CertificateException { } - /** {@inheritDoc} */ + @Override public X509Certificate[] getAcceptedIssuers() { return new X509Certificate[0]; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java index 4a2d62d18..e7c9ca727 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -77,18 +77,14 @@ * Directory Access Protocol (LDAP) Assertion Control */ public final class AssertionRequestControl implements Control { - /** - * The IANA-assigned OID for the LDAP assertion request control. - */ + /** The IANA-assigned OID for the LDAP assertion request control. */ public static final String OID = "1.3.6.1.1.12"; - /** - * A decoder which can be used for decoding the LDAP assertion request - * control. - */ + /** A decoder which can be used for decoding the LDAP assertion request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public AssertionRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -119,6 +115,7 @@ public AssertionRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -163,12 +160,12 @@ public Filter getFilter() { return filter; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -181,17 +178,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java index bd1dd4d55..d75d2d778 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -70,9 +71,7 @@ * Directory Access Protocol (LDAP) "Who am I?" Operation */ public final class AuthorizationIdentityRequestControl implements Control { - /** - * The OID for the authorization identity request control. - */ + /** The OID for the authorization identity request control. */ public static final String OID = "2.16.840.1.113730.3.4.16"; private final boolean isCritical; @@ -83,13 +82,11 @@ public final class AuthorizationIdentityRequestControl implements Control { private static final AuthorizationIdentityRequestControl NONCRITICAL_INSTANCE = new AuthorizationIdentityRequestControl(false); - /** - * A decoder which can be used for decoding the authorization identity - * request control. - */ + /** A decoder which can be used for decoding the authorization identity request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public AuthorizationIdentityRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -112,6 +109,7 @@ public AuthorizationIdentityRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -136,27 +134,26 @@ private AuthorizationIdentityRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java index bb75f3889..6a6db54b8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -77,9 +77,7 @@ */ public final class AuthorizationIdentityResponseControl implements Control { - /** - * The OID for the authorization identity response control. - */ + /** The OID for the authorization identity response control. */ public static final String OID = "2.16.840.1.113730.3.4.15"; /** @@ -101,13 +99,11 @@ public static AuthorizationIdentityResponseControl newControl(final String autho private final boolean isCritical; - /** - * A decoder which can be used for decoding the authorization identity - * response control. - */ + /** A decoder which can be used for decoding the authorization identity response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public AuthorizationIdentityResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -132,6 +128,7 @@ public AuthorizationIdentityResponseControl decodeControl(final Control control, return new AuthorizationIdentityResponseControl(control.isCritical(), authID); } + @Override public String getOID() { return OID; } @@ -157,27 +154,26 @@ public String getAuthorizationID() { return authorizationID; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return ByteString.valueOfUtf8(authorizationID); } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java index e17b8642e..9efc5faf3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -106,6 +106,7 @@ public final class EntryChangeNotificationResponseControl implements Control { public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public EntryChangeNotificationResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control, options); @@ -192,6 +193,7 @@ public EntryChangeNotificationResponseControl decodeControl(final Control contro changeType, previousDN, changeNumber); } + @Override public String getOID() { return OID; } @@ -290,6 +292,7 @@ public PersistentSearchChangeType getChangeType() { } /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -306,6 +309,7 @@ public DN getPreviousName() { } /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -329,11 +333,13 @@ public ByteString getValue() { } /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java index b2bf348e7..1bd050b8c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -127,27 +127,26 @@ private GenericControl(final String oid, final boolean isCritical, final ByteStr this.value = value; } - /** {@inheritDoc} */ + @Override public String getOID() { return oid; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return value; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return value != null; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java index 184e5222a..8c713f07c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -101,20 +101,16 @@ * @see draft-ietf-ldapext-acl-model * - Access Control Model for LDAPv3 - **/ + */ public final class GetEffectiveRightsRequestControl implements Control { - /** - * The OID for the get effective rights request control. - */ + /** The OID for the get effective rights request control. */ public static final String OID = "1.3.6.1.4.1.42.2.27.9.5.2"; - /** - * A decoder which can be used for decoding the get effective rights request - * control. - */ + /** A decoder which can be used for decoding the get effective rights request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public GetEffectiveRightsRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -201,6 +197,7 @@ public GetEffectiveRightsRequestControl decodeControl(final Control control, } + @Override public String getOID() { return OID; } @@ -322,12 +319,12 @@ public DN getAuthorizationName() { return authorizationName; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -352,17 +349,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return authorizationName != null || !attributes.isEmpty(); } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java index 41b62dd92..9ed24156d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -73,9 +74,7 @@ * Directories */ public final class ManageDsaITRequestControl implements Control { - /** - * The OID for the ManageDsaIT request control. - */ + /** The OID for the ManageDsaIT request control. */ public static final String OID = "2.16.840.1.113730.3.4.2"; private static final ManageDsaITRequestControl CRITICAL_INSTANCE = @@ -83,13 +82,11 @@ public final class ManageDsaITRequestControl implements Control { private static final ManageDsaITRequestControl NONCRITICAL_INSTANCE = new ManageDsaITRequestControl(false); - /** - * A decoder which can be used for decoding the Manage DsaIT request - * control. - */ + /** A decoder which can be used for decoding the Manage DsaIT request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public ManageDsaITRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -113,6 +110,7 @@ public ManageDsaITRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -138,27 +136,26 @@ private ManageDsaITRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java index f2594c868..9a1776283 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -98,9 +98,7 @@ * (LDAPv3) */ public final class MatchedValuesRequestControl implements Control { - /** - * Visitor for validating matched values filters. - */ + /** Visitor for validating matched values filters. */ private static final class FilterValidator extends AbstractFilterVisitor { @@ -154,13 +152,11 @@ public LocalizedIllegalArgumentException visitUnrecognizedFilter(final Filter p, */ public static final String OID = "1.2.826.0.1.3344810.2.3"; - /** - * A decoder which can be used for decoding the matched values request - * control. - */ + /** A decoder which can be used for decoding the matched values request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public MatchedValuesRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -214,6 +210,7 @@ public MatchedValuesRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -321,12 +318,11 @@ public Collection getFilters() { return filters; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); @@ -344,17 +340,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java index d4cfb6847..75c082364 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.controls; @@ -69,9 +69,7 @@ * - Password Policy for LDAP Directories */ public final class PasswordExpiredResponseControl implements Control { - /** - * The OID for the Netscape password expired response control. - */ + /** The OID for the Netscape password expired response control. */ public static final String OID = "2.16.840.1.113730.3.4.4"; private final boolean isCritical; @@ -81,13 +79,11 @@ public final class PasswordExpiredResponseControl implements Control { private static final PasswordExpiredResponseControl NONCRITICAL_INSTANCE = new PasswordExpiredResponseControl(false); - /** - * A decoder which can be used for decoding the password expired response - * control. - */ + /** A decoder which can be used for decoding the password expired response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PasswordExpiredResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -115,6 +111,7 @@ public PasswordExpiredResponseControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -135,27 +132,26 @@ private PasswordExpiredResponseControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return CONTROL_VALUE; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java index c469da10e..e4b8eff58 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS + * Portions copyright 2013-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.controls; @@ -68,18 +68,14 @@ public final class PasswordExpiringResponseControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the Netscape password expiring response control. - */ + /** The OID for the Netscape password expiring response control. */ public static final String OID = "2.16.840.1.113730.3.4.5"; - /** - * A decoder which can be used for decoding the password expiring response - * control. - */ + /** A decoder which can be used for decoding the password expiring response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PasswordExpiringResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -115,6 +111,7 @@ public PasswordExpiringResponseControl decodeControl(final Control control, secondsUntilExpiration); } + @Override public String getOID() { return OID; } @@ -144,7 +141,7 @@ private PasswordExpiringResponseControl(final boolean isCritical, this.secondsUntilExpiration = secondsUntilExpiration; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -160,22 +157,21 @@ public int getSecondsUntilExpiration() { return secondsUntilExpiration; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return ByteString.valueOfUtf8(String.valueOf(secondsUntilExpiration)); } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java index 5b10e7015..868f1ed4c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Portions Copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.controls; @@ -86,10 +86,7 @@ * */ public final class PasswordPolicyRequestControl implements Control { - /** - * The OID for the password policy control from - * draft-behera-ldap-password-policy. - */ + /** The OID for the password policy control from draft-behera-ldap-password-policy. */ public static final String OID = "1.3.6.1.4.1.42.2.27.8.5.1"; private final boolean isCritical; @@ -99,13 +96,11 @@ public final class PasswordPolicyRequestControl implements Control { private static final PasswordPolicyRequestControl NONCRITICAL_INSTANCE = new PasswordPolicyRequestControl(false); - /** - * A decoder which can be used for decoding the password policy request - * control. - */ + /** A decoder which can be used for decoding the password policy request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PasswordPolicyRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -128,6 +123,7 @@ public PasswordPolicyRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -151,27 +147,26 @@ private PasswordPolicyRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java index be9cbe248..2f76b8939 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -99,10 +99,7 @@ public final class PasswordPolicyResponseControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the password policy control from - * draft-behera-ldap-password-policy. - */ + /** The OID for the password policy control from draft-behera-ldap-password-policy. */ public static final String OID = PasswordPolicyRequestControl.OID; private final int warningValue; @@ -111,13 +108,11 @@ public final class PasswordPolicyResponseControl implements Control { private final PasswordPolicyWarningType warningType; - /** - * A decoder which can be used for decoding the password policy response - * control. - */ + /** A decoder which can be used for decoding the password policy response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PasswordPolicyResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -191,6 +186,7 @@ public PasswordPolicyResponseControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -260,14 +256,10 @@ public static PasswordPolicyResponseControl newControl( private final boolean isCritical; - /** - * The BER type value for the warning element of the control value. - */ + /** The BER type value for the warning element of the control value. */ private static final byte TYPE_WARNING_ELEMENT = (byte) 0xA0; - /** - * The BER type value for the error element of the control value. - */ + /** The BER type value for the error element of the control value. */ private static final byte TYPE_ERROR_ELEMENT = (byte) 0x81; private PasswordPolicyResponseControl(final boolean isCritical, @@ -289,12 +281,12 @@ public PasswordPolicyErrorType getErrorType() { return errorType; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -339,17 +331,16 @@ public int getWarningValue() { return warningValue; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java index 25e45cf6b..47149006b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -70,9 +71,7 @@ * */ public final class PermissiveModifyRequestControl implements Control { - /** - * The OID for the permissive modify request control. - */ + /** The OID for the permissive modify request control. */ public static final String OID = "1.2.840.113556.1.4.1413"; private static final PermissiveModifyRequestControl CRITICAL_INSTANCE = @@ -81,13 +80,11 @@ public final class PermissiveModifyRequestControl implements Control { private static final PermissiveModifyRequestControl NONCRITICAL_INSTANCE = new PermissiveModifyRequestControl(false); - /** - * A decoder which can be used for decoding the permissive modify request - * control. - */ + /** A decoder which can be used for decoding the permissive modify request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PermissiveModifyRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -111,6 +108,7 @@ public PermissiveModifyRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -136,27 +134,26 @@ private PermissiveModifyRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java index 4f51e3569..a9802437a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -98,18 +98,14 @@ public final class PersistentSearchRequestControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the persistent search request control. - */ + /** The OID for the persistent search request control. */ public static final String OID = "2.16.840.1.113730.3.4.3"; - /** - * A decoder which can be used for decoding the persistent search request - * control. - */ + /** A decoder which can be used for decoding the persistent search request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PersistentSearchRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -180,6 +176,7 @@ public PersistentSearchRequestControl decodeControl(final Control control, returnECs, Collections.unmodifiableSet(changeTypeSet)); } + @Override public String getOID() { return OID; } @@ -289,12 +286,12 @@ public Set getChangeTypes() { return changeTypes; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -317,7 +314,7 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } @@ -337,7 +334,7 @@ public boolean isChangesOnly() { return changesOnly; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } @@ -354,7 +351,6 @@ public boolean isReturnECs() { return returnECs; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java index 7d16df052..b338b4bf7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -98,12 +98,11 @@ public final class PostReadRequestControl implements Control { private static final PostReadRequestControl NONCRITICAL_EMPTY_INSTANCE = new PostReadRequestControl(false, Collections. emptyList()); - /** - * A decoder which can be used for decoding the post-read request control. - */ + /** A decoder which can be used for decoding the post-read request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PostReadRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -160,6 +159,7 @@ public PostReadRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -244,12 +244,12 @@ public List getAttributes() { return attributes; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -268,17 +268,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java index 817b6d729..997e5075c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -84,12 +84,11 @@ public final class PostReadResponseControl implements Control { */ public static final String OID = PostReadRequestControl.OID; - /** - * A decoder which can be used for decoding the post-read response control. - */ + /** A decoder which can be used for decoding the post-read response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PostReadResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -131,6 +130,7 @@ public PostReadResponseControl decodeControl(final Control control, .unmodifiableEntry(entry)); } + @Override public String getOID() { return OID; } @@ -178,12 +178,12 @@ public Entry getEntry() { return entry; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { try { final ByteStringBuilder buffer = new ByteStringBuilder(); @@ -195,17 +195,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java index feccc062b..c645e8a61 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -99,12 +99,11 @@ public final class PreReadRequestControl implements Control { private static final PreReadRequestControl NONCRITICAL_EMPTY_INSTANCE = new PreReadRequestControl(false, Collections. emptyList()); - /** - * A decoder which can be used for decoding the pre-read request control. - */ + /** A decoder which can be used for decoding the pre-read request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PreReadRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -161,6 +160,7 @@ public PreReadRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -245,12 +245,12 @@ public List getAttributes() { return attributes; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -269,17 +269,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java index 3b474007d..a7798ee88 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -83,12 +83,11 @@ public final class PreReadResponseControl implements Control { */ public static final String OID = PreReadRequestControl.OID; - /** - * A decoder which can be used for decoding the pre-read response control. - */ + /** A decoder which can be used for decoding the pre-read response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public PreReadResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -130,6 +129,7 @@ public PreReadResponseControl decodeControl(final Control control, .unmodifiableEntry(entry)); } + @Override public String getOID() { return OID; } @@ -177,12 +177,12 @@ public Entry getEntry() { return entry; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { try { final ByteStringBuilder buffer = new ByteStringBuilder(); @@ -194,17 +194,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java index 04b0d77bf..4157e38a8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -65,18 +65,14 @@ public final class ProxiedAuthV1RequestControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the proxied authorization v1 control. - */ + /** The OID for the proxied authorization v1 control. */ public static final String OID = "2.16.840.1.113730.3.4.12"; - /** - * A decoder which can be used for decoding the proxied authorization v1 - * request control. - */ + /** A decoder which can be used for decoding the proxied authorization v1 request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public ProxiedAuthV1RequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -131,6 +127,7 @@ public ProxiedAuthV1RequestControl decodeControl(final Control control, return new ProxiedAuthV1RequestControl(authorizationDN); } + @Override public String getOID() { return OID; } @@ -188,12 +185,12 @@ public DN getAuthorizationDNName() { return authorizationName; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -208,17 +205,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return true; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder buffer = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java index 82025f9a8..7a2af725e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -78,21 +78,17 @@ public final class ProxiedAuthV2RequestControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the proxied authorization v2 control. - */ + /** The OID for the proxied authorization v2 control. */ public static final String OID = "2.16.840.1.113730.3.4.18"; private static final ProxiedAuthV2RequestControl ANONYMOUS = new ProxiedAuthV2RequestControl(""); - /** - * A decoder which can be used for decoding the proxied authorization v2 - * request control. - */ + /** A decoder which can be used for decoding the proxied authorization v2 request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public ProxiedAuthV2RequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -152,6 +148,7 @@ public ProxiedAuthV2RequestControl decodeControl(final Control control, return new ProxiedAuthV2RequestControl(authorizationID); } + @Override public String getOID() { return OID; } @@ -209,27 +206,26 @@ public String getAuthorizationID() { return authorizationID; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return ByteString.valueOfUtf8(authorizationID); } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return true; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java index 66539db54..c3362388d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -89,28 +89,20 @@ * Extension for Server Side Sorting of Search Results */ public final class ServerSideSortRequestControl implements Control { - /** - * The OID for the server-side sort request control. - */ + /** The OID for the server-side sort request control. */ public static final String OID = "1.2.840.113556.1.4.473"; - /** - * The BER type to use when encoding the orderingRule element. - */ + /** The BER type to use when encoding the orderingRule element. */ private static final byte TYPE_ORDERING_RULE_ID = (byte) 0x80; - /** - * The BER type to use when encoding the reverseOrder element. - */ + /** The BER type to use when encoding the reverseOrder element. */ private static final byte TYPE_REVERSE_ORDER = (byte) 0x81; - /** - * A decoder which can be used for decoding the server side sort request - * control. - */ + /** A decoder which can be used for decoding the server side sort request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public ServerSideSortRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -171,6 +163,7 @@ public ServerSideSortRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -268,7 +261,7 @@ private ServerSideSortRequestControl(final boolean isCritical, final List getSortKeys() { return sortKeys; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -314,17 +307,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder buffer = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java index 5cd825e3e..0969d2bb8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -82,18 +82,14 @@ * Extension for Server Side Sorting of Search Results */ public final class ServerSideSortResponseControl implements Control { - /** - * The OID for the server-side sort response control. - */ + /** The OID for the server-side sort response control. */ public static final String OID = "1.2.840.113556.1.4.474"; - /** - * A decoder which can be used for decoding the server side sort response - * control. - */ + /** A decoder which can be used for decoding the server side sort response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public ServerSideSortResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control, options); @@ -140,14 +136,13 @@ public ServerSideSortResponseControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } }; - /** - * The BER type to use when encoding the attribute type element. - */ + /** The BER type to use when encoding the attribute type element. */ private static final byte TYPE_ATTRIBUTE_TYPE = (byte) 0x80; /** @@ -258,7 +253,7 @@ public AttributeDescription getAttributeDescription() { return attributeDescription; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -278,7 +273,7 @@ public ResultCode getResult() { return result; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -296,17 +291,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java index 4a105ceab..ebb818cf0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -134,19 +134,14 @@ public final class SimplePagedResultsControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the paged results request/response control defined in RFC - * 2696. - */ + /** The OID for the paged results request/response control defined in RFC 2696. */ public static final String OID = "1.2.840.113556.1.4.319"; - /** - * A decoder which can be used for decoding the simple paged results - * control. - */ + /** A decoder which can be used for decoding the simple paged results control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public SimplePagedResultsControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -198,6 +193,7 @@ public SimplePagedResultsControl decodeControl(final Control control, return new SimplePagedResultsControl(control.isCritical(), size, cookie); } + @Override public String getOID() { return OID; } @@ -240,9 +236,7 @@ public static SimplePagedResultsControl newControl(final boolean isCritical, fin */ private final int size; - /** - * The control value cookie element. - */ + /** The control value cookie element. */ private final ByteString cookie; private final boolean isCritical; @@ -269,7 +263,7 @@ public ByteString getCookie() { return cookie; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -288,7 +282,7 @@ public int getSize() { return size; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -304,17 +298,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java index d45ce3d61..1e692b2dc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.controls; @@ -94,9 +94,7 @@ public final class SubentriesRequestControl implements Control { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the sub-entries request control. - */ + /** The OID for the sub-entries request control. */ public static final String OID = "1.3.6.1.4.1.4203.1.10.1"; private static final SubentriesRequestControl CRITICAL_VISIBLE_INSTANCE = @@ -108,12 +106,11 @@ public final class SubentriesRequestControl implements Control { private static final SubentriesRequestControl NONCRITICAL_INVISIBLE_INSTANCE = new SubentriesRequestControl(false, false); - /** - * A decoder which can be used for decoding the sub-entries request control. - */ + /** A decoder which can be used for decoding the sub-entries request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public SubentriesRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -148,6 +145,7 @@ public SubentriesRequestControl decodeControl(final Control control, return newControl(control.isCritical(), visibility); } + @Override public String getOID() { return OID; } @@ -184,12 +182,12 @@ private SubentriesRequestControl(final boolean isCritical, final boolean visibil this.visibility = visibility; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -214,17 +212,16 @@ public boolean getVisibility() { return visibility; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java index 6db2cdf61..6588b8ed3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -55,9 +56,7 @@ * - Tree Delete Control */ public final class SubtreeDeleteRequestControl implements Control { - /** - * The OID for the subtree delete request control. - */ + /** The OID for the subtree delete request control. */ public static final String OID = "1.2.840.113556.1.4.805"; private static final SubtreeDeleteRequestControl CRITICAL_INSTANCE = @@ -66,13 +65,11 @@ public final class SubtreeDeleteRequestControl implements Control { private static final SubtreeDeleteRequestControl NONCRITICAL_INSTANCE = new SubtreeDeleteRequestControl(false); - /** - * A decoder which can be used for decoding the sub-tree delete request - * control. - */ + /** A decoder which can be used for decoding the sub-tree delete request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public SubtreeDeleteRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -96,6 +93,7 @@ public SubtreeDeleteRequestControl decodeControl(final Control control, return control.isCritical() ? CRITICAL_INSTANCE : NONCRITICAL_INSTANCE; } + @Override public String getOID() { return OID; } @@ -121,27 +119,26 @@ private SubtreeDeleteRequestControl(final boolean isCritical) { this.isCritical = isCritical; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java index fd9993dfd..022a33bb9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -130,18 +130,14 @@ * Browsing of Search Results */ public final class VirtualListViewRequestControl implements Control { - /** - * The OID for the virtual list view request control. - */ + /** The OID for the virtual list view request control. */ public static final String OID = "2.16.840.1.113730.3.4.9"; - /** - * A decoder which can be used for decoding the virtual list view request - * control. - */ + /** A decoder which can be used for decoding the virtual list view request control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public VirtualListViewRequestControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -204,19 +200,16 @@ public VirtualListViewRequestControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } }; - /** - * The BER type to use when encoding the byOffset target element. - */ + /** The BER type to use when encoding the byOffset target element. */ private static final byte TYPE_TARGET_BYOFFSET = (byte) 0xA0; - /** - * The BER type to use when encoding the greaterThanOrEqual target element. - */ + /** The BER type to use when encoding the greaterThanOrEqual target element. */ private static final byte TYPE_TARGET_GREATERTHANOREQUAL = (byte) 0x81; /** @@ -417,12 +410,12 @@ public int getOffset() { return offset; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -460,17 +453,16 @@ public boolean hasTargetOffset() { return assertionValue == null; } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java index 418dc398f..c81269d85 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -127,18 +127,14 @@ * Browsing of Search Results */ public final class VirtualListViewResponseControl implements Control { - /** - * The OID for the virtual list view request control. - */ + /** The OID for the virtual list view request control. */ public static final String OID = "2.16.840.1.113730.3.4.10"; - /** - * A decoder which can be used for decoding the virtual list view response - * control. - */ + /** A decoder which can be used for decoding the virtual list view response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { + @Override public VirtualListViewResponseControl decodeControl(final Control control, final DecodeOptions options) throws DecodeException { Reject.ifNull(control); @@ -180,6 +176,7 @@ public VirtualListViewResponseControl decodeControl(final Control control, } } + @Override public String getOID() { return OID; } @@ -256,7 +253,7 @@ public ByteString getContextID() { return contextID; } - /** {@inheritDoc} */ + @Override public String getOID() { return OID; } @@ -281,7 +278,7 @@ public int getTargetPosition() { return targetPosition; } - /** {@inheritDoc} */ + @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); final ASN1Writer writer = ASN1.getWriter(buffer); @@ -301,17 +298,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ + @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ + @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java index 7fefd8653..a9927168c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -35,22 +36,27 @@ abstract class AbstractSyntaxImpl implements SyntaxImpl { // Nothing to do. } + @Override public String getApproximateMatchingRule() { return null; } + @Override public String getEqualityMatchingRule() { return null; } + @Override public String getOrderingMatchingRule() { return null; } + @Override public String getSubstringMatchingRule() { return null; } + @Override public boolean isBEREncodingRequired() { return false; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java index 12adfd289..78f1d8331 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -500,6 +500,7 @@ private AttributeType(Builder builder) { * @throws NullPointerException * If {@code name} was {@code null}. */ + @Override public int compareTo(final AttributeType type) { if (isObjectClassType) { return type.isObjectClassType ? 0 : -1; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java index 03941283c..5b1707a61 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java @@ -22,8 +22,8 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import static org.forgerock.opendj.ldap.schema.SchemaConstants.EMR_OCTET_STRING_OID; @@ -44,6 +44,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_BINARY_NAME; } @@ -53,24 +54,12 @@ public String getOrderingMatchingRule() { return OMR_OCTET_STRING_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the binary syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java index 25449230d..32d8cc8ca 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -46,28 +47,17 @@ public String getEqualityMatchingRule() { return EMR_BIT_STRING_OID; } + @Override public String getName() { return SYNTAX_BIT_STRING_NAME; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String valueString = value.toString().toUpperCase(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java index 4e59cc1fa..bbb073854 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -46,28 +47,17 @@ public String getEqualityMatchingRule() { return EMR_BOOLEAN_OID; } + @Override public String getName() { return SYNTAX_BOOLEAN_NAME; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String valueString = value.toString().toUpperCase(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java index c16179933..66272a7e7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java @@ -23,6 +23,7 @@ * * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -37,23 +38,22 @@ */ final class CertificateExactAssertionSyntaxImpl extends AbstractSyntaxImpl { - /** {@inheritDoc} */ + @Override public String getName() { return SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME; } - /** {@inheritDoc} */ @Override public boolean isBEREncodingRequired() { return false; } - /** {@inheritDoc} */ + @Override public boolean isHumanReadable() { return true; } - /** {@inheritDoc} */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // This method will never be called because this syntax is only used diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java index a5af1f8ea..e3eca58f0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -45,6 +46,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_CERTLIST_NAME; } @@ -59,24 +61,12 @@ public boolean isBEREncodingRequired() { return true; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the certificate list syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java index 91f91e8b1..cb69d0245 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,6 +45,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_CERTPAIR_NAME; } @@ -58,24 +60,12 @@ public boolean isBEREncodingRequired() { return true; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the certificate pair syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java index db458f878..e111af82d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java @@ -23,6 +23,7 @@ * * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2012 Manuel Gaupp + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -52,6 +53,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_COUNTRY_STRING_NAME; } @@ -66,24 +68,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String stringValue = value.toString(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java index 4288c966c..e836fd77f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -53,15 +53,17 @@ public String getEqualityMatchingRule() { return EMR_OID_FIRST_COMPONENT_NAME; } + @Override public String getName() { return SYNTAX_DIT_CONTENT_RULE_NAME; } + @Override public boolean isHumanReadable() { return true; } - /** {@inheritDoc} */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We'll use the decodeDITContentRule method to determine if the diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java index 0216bed53..ba626af4b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -84,6 +84,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_DELIVERY_METHOD_NAME; } @@ -98,24 +99,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String stringValue = toLowerCase(value.toString()); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java index d099db52b..dd82c7745 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -59,6 +59,7 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV SchemaUtils.normalizeStringAttributeValue(assertionValue, TRIM, CASE_FOLD)); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { final String definition = value.toString(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java index d3182080a..2772469d9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -51,6 +51,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_DIRECTORY_STRING_NAME; } @@ -65,24 +66,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { if (value.length() > 0 || schema.getOption(ALLOW_ZERO_LENGTH_DIRECTORY_STRINGS)) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java index 16c6b1985..7014b2d3a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,7 +44,7 @@ final class DistinguishedNameEqualityMatchingRuleImpl extends AbstractEqualityMa super(EMR_DN_NAME); } - /** {@inheritDoc} */ + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { try { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java index a162d4223..6a109618e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -46,6 +47,7 @@ public String getEqualityMatchingRule() { return EMR_DN_OID; } + @Override public String getName() { return SYNTAX_DN_NAME; } @@ -55,10 +57,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { try { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java index 9b23da5df..7510d240a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -59,7 +59,7 @@ final class DoubleMetaphoneApproximateMatchingRuleImpl extends AbstractApproxima super(AMR_DOUBLE_METAPHONE_NAME); } - /** {@inheritDoc} */ + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { String valueString = value.toString(); final int length = valueString.length(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java index d873a9818..176df026e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java @@ -22,9 +22,8 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ - package org.forgerock.opendj.ldap.schema; import static com.forgerock.opendj.util.StaticUtils.toLowerCase; @@ -68,20 +67,6 @@ public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java index 6ae8f95b8..b854851ea 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -79,6 +79,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return oid; } @@ -97,10 +98,12 @@ public int indexOf(final ByteSequence value) { return entries.indexOf(normalize(value)); } + @Override public boolean isHumanReadable() { return true; } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // The value is acceptable if it belongs to the set. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java index ed8ba66e3..0f822fe7e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -79,6 +79,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_FAXNUMBER_NAME; } @@ -93,24 +94,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Get a lowercase string representation of the value and find its diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java index 58460c395..6fc1dc1f3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -45,6 +46,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_FAX_NAME; } @@ -54,24 +56,12 @@ public String getOrderingMatchingRule() { return OMR_OCTET_STRING_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the fax syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java index d7dce93ee..46462adb4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,6 +44,7 @@ final class GeneralizedTimeEqualityMatchingRuleImpl extends AbstractEqualityMatc super(EMR_GENERALIZED_TIME_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { return normalizeAttributeValue(value); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java index 3107ae036..2113efd78 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -43,6 +43,7 @@ final class GeneralizedTimeOrderingMatchingRuleImpl extends AbstractOrderingMatc super(EMR_GENERALIZED_TIME_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { return GeneralizedTimeEqualityMatchingRuleImpl.normalizeAttributeValue(value); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java index 0ba5d70b1..0517d9018 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -49,6 +49,7 @@ public String getEqualityMatchingRule() { return EMR_GENERALIZED_TIME_OID; } + @Override public String getName() { return SYNTAX_GENERALIZED_TIME_NAME; } @@ -63,24 +64,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { try { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java index 432299a62..8e21b6ac7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java @@ -22,9 +22,8 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ - package org.forgerock.opendj.ldap.schema; import static com.forgerock.opendj.util.StaticUtils.toLowerCase; @@ -290,20 +289,6 @@ public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java index 99428ea86..31beed73a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -50,6 +51,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_IA5_STRING_NAME; } @@ -64,24 +66,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We will allow any value that does not contain any non-ASCII diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java index 863c05c08..4d1b15781 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS + * Portions copyright 2013-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -64,6 +64,7 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV } } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { final String definition = value.toString(); final SubstringReader reader = new SubstringReader(definition); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java index b69878f7c..c31f99e45 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -49,6 +50,7 @@ public String getEqualityMatchingRule() { return EMR_INTEGER_OID; } + @Override public String getName() { return SYNTAX_INTEGER_NAME; } @@ -63,24 +65,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_EXACT_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String valueString = value.toString(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java index 34358653d..fc0d61b6b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS + * Portions Copyright 2012-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -59,20 +59,6 @@ public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java index 1f350f1b4..859775e29 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -73,6 +73,7 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV final String normalStr = normalize(assertionValue); return new Assertion() { + @Override public ConditionResult matches(final ByteSequence attributeValue) { // See if the assertion value is contained in the attribute // value. If not, then it isn't a match. @@ -133,6 +134,7 @@ public Collection createIndexers(IndexingOptions options) { return Collections.emptySet(); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return ByteString.valueOfUtf8(normalize(value)); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java index ac4447405..11ea9b798 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -63,20 +63,6 @@ public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java index d65ca3f71..6d1a10d77 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -65,20 +65,6 @@ public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java index ea7b36ca3..461df3231 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -49,6 +50,7 @@ public String getEqualityMatchingRule() { return EMR_UNIQUE_MEMBER_OID; } + @Override public String getName() { return SYNTAX_NAME_AND_OPTIONAL_UID_NAME; } @@ -58,24 +60,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String valueString = value.toString().trim(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java index bbd082876..59d48f6db 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -55,14 +55,17 @@ public String getEqualityMatchingRule() { return EMR_OID_FIRST_COMPONENT_OID; } + @Override public String getName() { return SYNTAX_NAME_FORM_NAME; } + @Override public boolean isHumanReadable() { return true; } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We'll use the decodeNameForm method to determine if the value is diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java index dcc75fcb1..172fd236d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -42,6 +42,7 @@ final class NumericStringEqualityMatchingRuleImpl extends AbstractEqualityMatchi super(EMR_NUMERIC_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return SchemaUtils.normalizeNumericStringAttributeValue(value); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java index 2b9bc3f9f..439dc3a19 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -42,6 +42,7 @@ final class NumericStringOrderingMatchingRuleImpl extends AbstractOrderingMatchi super(EMR_NUMERIC_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return SchemaUtils.normalizeNumericStringAttributeValue(value); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java index 2d06bf492..150bea7e7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -41,6 +41,7 @@ final class NumericStringSubstringMatchingRuleImpl extends AbstractSubstringMatc super(SMR_NUMERIC_STRING_NAME, EMR_NUMERIC_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return SchemaUtils.normalizeNumericStringAttributeValue(value); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java index 070a5ed66..4f29ab419 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -49,6 +50,7 @@ public String getEqualityMatchingRule() { return EMR_NUMERIC_STRING_OID; } + @Override public String getName() { return SYNTAX_NUMERIC_STRING_NAME; } @@ -63,24 +65,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_EXACT_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String valueString = value.toString(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java index 6963ea0d6..e2b31dfa7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -48,6 +48,7 @@ public String getEqualityMatchingRule() { return EMR_OID_OID; } + @Override public String getName() { return SYNTAX_OID_NAME; } @@ -57,24 +58,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { try { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java index 5e0e02a52..3520f7f51 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -42,6 +42,7 @@ final class OctetStringEqualityMatchingRuleImpl extends AbstractEqualityMatching super(EMR_OCTET_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return value.toByteString(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java index f0e9c9f9c..b74f1b768 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2015 ForgeRock AS. + * Portions copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -43,6 +43,7 @@ final class OctetStringOrderingMatchingRuleImpl extends AbstractOrderingMatching super(EMR_OCTET_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return value.toByteString(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java index 12d9fee19..882f29ce1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -42,6 +42,7 @@ final class OctetStringSubstringMatchingRuleImpl extends AbstractSubstringMatchi super(SMR_OCTET_STRING_NAME, EMR_OCTET_STRING_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { return value.toByteString(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java index d378b70ec..bbd2e915e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,6 +45,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_OCTET_STRING_NAME; } @@ -53,24 +55,12 @@ public String getOrderingMatchingRule() { return OMR_OCTET_STRING_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the octet string syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java index 533a8c8f9..eaa2e8afd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -47,6 +48,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_LIST_OID; } + @Override public String getName() { return SYNTAX_OTHER_MAILBOX_NAME; } @@ -56,24 +58,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_LIST_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Check to see if the provided value was null. If so, then that's diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java index 4a9b15e62..6e9eea870 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -47,6 +48,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_POSTAL_ADDRESS_NAME; } @@ -56,24 +58,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We'll allow any value. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java index e708a2064..d542905b1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -47,6 +48,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_PRESENTATION_ADDRESS_NAME; } @@ -61,24 +63,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We will accept any value for this syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java index 2aa67d8b3..ac8e6281c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -142,6 +143,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_PRINTABLE_STRING_NAME; } @@ -156,24 +158,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Check to see if the provided value was null. If so, then that's diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java index 7a5b2b0e1..3d13258a5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -48,6 +49,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_PROTOCOL_INFORMATION_NAME; } @@ -62,24 +64,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We will accept any value for this syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java index c87030f82..da8620400 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -64,6 +65,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return "Regex(" + pattern + ")"; } @@ -78,10 +80,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { final String strValue = value.toString(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java index 44de6ea7d..da69f9cc8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java @@ -22,8 +22,8 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import org.forgerock.i18n.LocalizableException; @@ -63,7 +63,7 @@ public SchemaException(final LocalizableMessage message, final Throwable cause) this.message = message; } - /** {@inheritDoc} */ + @Override public LocalizableMessage getMessageObject() { return this.message; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java index 8c1fc1b74..5e21b62d7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -48,6 +49,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_SUBSTRING_ASSERTION_NAME; } @@ -62,24 +64,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Get the string representation of the value and check its length. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java index dbe0ffcfd..2ead6a3f9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -46,6 +47,7 @@ public String getEqualityMatchingRule() { return EMR_OCTET_STRING_OID; } + @Override public String getName() { return SYNTAX_SUPPORTED_ALGORITHM_NAME; } @@ -60,24 +62,12 @@ public boolean isBEREncodingRequired() { return true; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for the supported algorithm syntax. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java index b34015975..101e28bc1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -45,6 +45,7 @@ final class TelephoneNumberEqualityMatchingRuleImpl extends AbstractEqualityMatc super(EMR_TELEPHONE_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { final String valueString = value.toString(); final int valueLength = valueString.length(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java index bad987a62..03a309daf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -45,6 +45,7 @@ final class TelephoneNumberSubstringMatchingRuleImpl extends AbstractSubstringMa super(SMR_TELEPHONE_NAME, EMR_TELEPHONE_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) { final String valueString = value.toString(); final int valueLength = valueString.length(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java index ca2424d9a..4badf4320 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -56,6 +56,7 @@ public String getEqualityMatchingRule() { return EMR_TELEPHONE_OID; } + @Override public String getName() { return SYNTAX_TELEPHONE_NAME; } @@ -65,24 +66,12 @@ public String getSubstringMatchingRule() { return SMR_TELEPHONE_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // No matter what, the value can't be empty or null. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java index 69547ae16..77c341e65 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -74,6 +74,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_TELETEX_TERM_ID_NAME; } @@ -88,24 +89,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Get a lowercase string representation of the value and find its diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java index b3e435e8d..c682c12cb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -50,6 +51,7 @@ public String getEqualityMatchingRule() { return EMR_CASE_IGNORE_OID; } + @Override public String getName() { return SYNTAX_TELEX_NAME; } @@ -64,24 +66,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Get a string representation of the value and find its length. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java index 85f25852a..bdc71a464 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS + * Portions copyright 2012-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -158,6 +158,7 @@ public String getEqualityMatchingRule() { return EMR_GENERALIZED_TIME_OID; } + @Override public String getName() { return SYNTAX_UTC_TIME_NAME; } @@ -172,24 +173,12 @@ public String getSubstringMatchingRule() { return SMR_CASE_IGNORE_OID; } + @Override public boolean isHumanReadable() { return false; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // Get the value as a string and verify that it is at least long diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java index 2263712f0..f238f0ee8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -39,28 +40,17 @@ * and ordering matching will be allowed by default. */ final class UUIDSyntaxImpl extends AbstractSyntaxImpl { + @Override public String getName() { return SYNTAX_UUID_NAME; } + @Override public boolean isHumanReadable() { return true; } - /** - * Indicates whether the provided value is acceptable for use in an - * attribute with this syntax. If it is not, then the reason may be appended - * to the provided buffer. - * - * @param schema - * The schema in which this syntax is defined. - * @param value - * The value for which to make the determination. - * @param invalidReason - * The buffer to which the invalid reason should be appended. - * @return true if the provided value is acceptable for use - * with this syntax, or false if not. - */ + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We will only accept values that look like valid UUIDs. This means diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java index 2de189895..3febe84f3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -47,6 +47,7 @@ final class UniqueMemberEqualityMatchingRuleImpl extends AbstractEqualityMatchin super(EMR_UNIQUE_MEMBER_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { // Separate value into normalized DN and "optional uid" portion. final String stringValue = value.toString().trim(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java index 6a10d03ba..f9e8c4f1a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -45,6 +45,7 @@ final class UserPasswordExactEqualityMatchingRuleImpl extends AbstractEqualityMa super(EMR_USER_PASSWORD_EXACT_NAME); } + @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { // The normalized form of this matching rule is exactly equal to the diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java index 1d259ce68..254dd2d54 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -141,14 +142,17 @@ public String getEqualityMatchingRule() { return EMR_USER_PASSWORD_EXACT_OID; } + @Override public String getName() { return SYNTAX_USER_PASSWORD_NAME; } + @Override public boolean isHumanReadable() { return true; } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { // We have to accept any value here because in many cases the value diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java index 8883b97bb..12daaa135 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; @@ -64,7 +64,6 @@ public abstract class ResultLdapPromiseImpl this.timestamp = System.currentTimeMillis(); } - /** {@inheritDoc} */ @Override public final boolean handleIntermediateResponse(final IntermediateResponse response) { // FIXME: there's a potential race condition here - the promise could @@ -97,6 +96,7 @@ public boolean isBindOrStartTLS() { * * @return String representation of this promise's state. */ + @Override public String toString() { final StringBuilder sb = new StringBuilder(); sb.append("( requestID = "); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java index d532d7755..61657f9ee 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java @@ -22,18 +22,11 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS + * Portions copyright 2012-2016 ForgeRock AS */ - package org.forgerock.opendj.ldif; -import java.util.List; - import org.forgerock.opendj.ldap.DN; -import org.forgerock.opendj.ldap.DecodeException; -import org.forgerock.opendj.ldap.DecodeOptions; -import org.forgerock.opendj.ldap.controls.Control; -import org.forgerock.opendj.ldap.controls.ControlDecoder; import org.forgerock.opendj.ldap.requests.Request; /** @@ -113,14 +106,4 @@ public interface ChangeRecord extends Request { * If {@code dn} was {@code null}. */ // ChangeRecord setName(String dn); - - /** {@inheritDoc} */ - Request addControl(Control control); - - /** {@inheritDoc} */ - C getControl(ControlDecoder decoder, DecodeOptions options) - throws DecodeException; - - /** {@inheritDoc} */ - List getControls(); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java index 46b7af4f6..6cafbc6b0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java @@ -22,6 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -54,6 +55,7 @@ private ChangeRecordVisitorWriter() { // Nothing to do. } + @Override public IOException visitChangeRecord(final ChangeRecordWriter p, final AddRequest change) { try { p.writeChangeRecord(change); @@ -63,6 +65,7 @@ public IOException visitChangeRecord(final ChangeRecordWriter p, final AddReques } } + @Override public IOException visitChangeRecord(final ChangeRecordWriter p, final DeleteRequest change) { try { p.writeChangeRecord(change); @@ -72,6 +75,7 @@ public IOException visitChangeRecord(final ChangeRecordWriter p, final DeleteReq } } + @Override public IOException visitChangeRecord(final ChangeRecordWriter p, final ModifyDNRequest change) { try { p.writeChangeRecord(change); @@ -81,6 +85,7 @@ public IOException visitChangeRecord(final ChangeRecordWriter p, final ModifyDNR } } + @Override public IOException visitChangeRecord(final ChangeRecordWriter p, final ModifyRequest change) { try { p.writeChangeRecord(change); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java index ca8efb8d5..cc8b743d3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -48,6 +48,7 @@ public interface ChangeRecordWriter extends Closeable, Flushable { * @throws IOException * If an unexpected IO error occurred while closing. */ + @Override void close() throws IOException; /** @@ -64,6 +65,7 @@ public interface ChangeRecordWriter extends Closeable, Flushable { * @throws IOException * If an unexpected IO error occurred while flushing. */ + @Override void flush() throws IOException; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java index d41705cb2..1ba6532b5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -74,6 +74,7 @@ public ConnectionChangeRecordWriter(final Connection connection) { * connection. Closing a previously closed change record writer has no * effect. */ + @Override public void close() { connection.close(); } @@ -82,6 +83,7 @@ public void close() { * Connection change record writers do not require flushing, so this method * has no effect. */ + @Override public void flush() { // Do nothing. } @@ -99,6 +101,7 @@ public void flush() { * @throws NullPointerException * If {@code change} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeChangeRecord(final AddRequest change) throws LdapException { Reject.ifNull(change); connection.add(change); @@ -118,6 +121,7 @@ public ConnectionChangeRecordWriter writeChangeRecord(final AddRequest change) t * @throws NullPointerException * If {@code change} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeChangeRecord(final ChangeRecord change) throws LdapException { Reject.ifNull(change); @@ -148,6 +152,7 @@ public ConnectionChangeRecordWriter writeChangeRecord(final ChangeRecord change) * @throws NullPointerException * If {@code change} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeChangeRecord(final DeleteRequest change) throws LdapException { Reject.ifNull(change); connection.delete(change); @@ -167,6 +172,7 @@ public ConnectionChangeRecordWriter writeChangeRecord(final DeleteRequest change * @throws NullPointerException * If {@code change} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeChangeRecord(final ModifyDNRequest change) throws LdapException { Reject.ifNull(change); connection.modifyDN(change); @@ -186,6 +192,7 @@ public ConnectionChangeRecordWriter writeChangeRecord(final ModifyDNRequest chan * @throws NullPointerException * If {@code change} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeChangeRecord(final ModifyRequest change) throws LdapException { Reject.ifNull(change); connection.modify(change); @@ -202,6 +209,7 @@ public ConnectionChangeRecordWriter writeChangeRecord(final ModifyRequest change * @throws NullPointerException * If {@code comment} was {@code null}. */ + @Override public ConnectionChangeRecordWriter writeComment(final CharSequence comment) { Reject.ifNull(comment); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java index 35126bc25..aaabd4453 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -67,6 +67,7 @@ public ConnectionEntryWriter(final Connection connection) { * Closes this connection entry writer, including the underlying connection. * Closing a previously closed entry writer has no effect. */ + @Override public void close() { connection.close(); } @@ -75,6 +76,7 @@ public void close() { * Connection entry writers do not require flushing, so this method has no * effect. */ + @Override public void flush() { // Do nothing. } @@ -89,6 +91,7 @@ public void flush() { * @throws NullPointerException * If {@code comment} was {@code null}. */ + @Override public ConnectionEntryWriter writeComment(final CharSequence comment) { Reject.ifNull(comment); @@ -109,6 +112,7 @@ public ConnectionEntryWriter writeComment(final CharSequence comment) { * @throws NullPointerException * If {@code entry} was {@code null}. */ + @Override public ConnectionEntryWriter writeEntry(final Entry entry) throws LdapException { Reject.ifNull(entry); connection.add(entry); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java index e2c345d36..c57dce656 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -44,6 +44,7 @@ public interface EntryWriter extends Closeable, Flushable { * @throws IOException * If an unexpected IO error occurred while closing. */ + @Override void close() throws IOException; /** @@ -60,6 +61,7 @@ public interface EntryWriter extends Closeable, Flushable { * @throws IOException * If an unexpected IO error occurred while flushing. */ + @Override void flush() throws IOException; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java index af8bf1459..57dfb4bee 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java @@ -20,7 +20,7 @@ * * CDDL HEADER END * - * Copyright 2011-2015 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldif; @@ -76,8 +76,11 @@ public final class LDIF { private static final class EntryIteratorReader implements EntryReader { private final Iterator iterator; private EntryIteratorReader(final Iterator iterator) { this.iterator = iterator; } + @Override public void close() { } + @Override public boolean hasNext() { return iterator.hasNext(); } + @Override public Entry readEntry() { return iterator.next(); } } // @formatter:on @@ -86,6 +89,7 @@ public void close() { } * Comparator ordering the DN ASC. */ private static final Comparator DN_ORDER2 = new Comparator() { + @Override public int compare(byte[][] b1, byte[][] b2) { return DN_ORDER.compare(b1[0], b2[0]); } @@ -95,6 +99,7 @@ public int compare(byte[][] b1, byte[][] b2) { * Comparator ordering the DN ASC. */ private static final Comparator DN_ORDER = new Comparator() { + @Override public int compare(byte[] b1, byte[] b2) { final ByteString bs = ByteString.valueOfBytes(b1); final ByteString bs2 = ByteString.valueOfBytes(b2); @@ -693,10 +698,12 @@ public static EntryReader search(final EntryReader input, final SearchRequest se private Entry nextEntry = null; private int entryCount = 0; + @Override public void close() throws IOException { input.close(); } + @Override public boolean hasNext() throws IOException { if (nextEntry == null) { final int sizeLimit = search.getSizeLimit(); @@ -716,6 +723,7 @@ public boolean hasNext() throws IOException { return nextEntry != null; } + @Override public Entry readEntry() throws IOException { if (hasNext()) { final Entry entry = nextEntry; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java index 0aa8d50f2..0299cef88 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java @@ -22,9 +22,8 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldif; import java.io.IOException; @@ -102,13 +101,11 @@ public LDIFEntryWriter(final Writer writer) { super(writer); } - /** {@inheritDoc} */ @Override public void close() throws IOException { close0(); } - /** {@inheritDoc} */ @Override public void flush() throws IOException { flush0(); @@ -261,14 +258,12 @@ public LDIFEntryWriter setWrapColumn(final int wrapColumn) { return this; } - /** {@inheritDoc} */ @Override public LDIFEntryWriter writeComment(final CharSequence comment) throws IOException { writeComment0(comment); return this; } - /** {@inheritDoc} */ @Override public LDIFEntryWriter writeEntry(final Entry entry) throws IOException { Reject.ifNull(entry); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java index facc073ae..ccd77a8e7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java @@ -20,7 +20,7 @@ * * CDDL HEADER END * - * Copyright 2011 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldif; @@ -50,30 +50,36 @@ public interface RejectedChangeRecordListener { */ RejectedChangeRecordListener FAIL_FAST = new RejectedChangeRecordListener() { + @Override public Entry handleDuplicateEntry(final AddRequest change, final Entry existingEntry) throws DecodeException { throw DecodeException.error(REJECTED_CHANGE_FAIL_ADD_DUPE.get(change.getName())); } + @Override public Entry handleDuplicateEntry(final ModifyDNRequest change, final Entry existingEntry, final Entry renamedEntry) throws DecodeException { throw DecodeException.error(REJECTED_CHANGE_FAIL_MODIFYDN_DUPE.get(renamedEntry.getName())); } + @Override public void handleRejectedChangeRecord(final AddRequest change, final LocalizableMessage reason) throws DecodeException { throw DecodeException.error(reason); } + @Override public void handleRejectedChangeRecord(final DeleteRequest change, final LocalizableMessage reason) throws DecodeException { throw DecodeException.error(reason); } + @Override public void handleRejectedChangeRecord(final ModifyRequest change, final LocalizableMessage reason) throws DecodeException { throw DecodeException.error(reason); } + @Override public void handleRejectedChangeRecord(final ModifyDNRequest change, final LocalizableMessage reason) throws DecodeException { throw DecodeException.error(reason); @@ -88,31 +94,37 @@ public void handleRejectedChangeRecord(final ModifyDNRequest change, final Local */ RejectedChangeRecordListener OVERWRITE = new RejectedChangeRecordListener() { + @Override public Entry handleDuplicateEntry(final AddRequest change, final Entry existingEntry) throws DecodeException { // Overwrite existing entries. return change; } + @Override public Entry handleDuplicateEntry(final ModifyDNRequest change, final Entry existingEntry, final Entry renamedEntry) throws DecodeException { // Overwrite existing entries. return renamedEntry; } + @Override public void handleRejectedChangeRecord(AddRequest change, LocalizableMessage reason) throws DecodeException { // Ignore. } + @Override public void handleRejectedChangeRecord(DeleteRequest change, LocalizableMessage reason) throws DecodeException { // Ignore. } + @Override public void handleRejectedChangeRecord(ModifyRequest change, LocalizableMessage reason) throws DecodeException { // Ignore. } + @Override public void handleRejectedChangeRecord(ModifyDNRequest change, LocalizableMessage reason) throws DecodeException { // Ignore. diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java index e4f272d0a..21b87a4db 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.requests; @@ -63,6 +63,7 @@ protected GSSAPISASLBindRequest[] newInstance() { }; } + @Override @Test(enabled = false) public void testBindClient(BindRequest request) throws Exception { // Should setup a test krb server... diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java index b33a33665..5b01cd532 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; @@ -56,11 +56,13 @@ public abstract class RequestsTestCase extends ForgeRockTestCase { /** Dummy decoder which does nothing. */ private static class MyDecoder implements ControlDecoder { + @Override public Control decodeControl(final Control control, final DecodeOptions options) throws DecodeException { // do nothing. return control; } + @Override public String getOID() { return "1.2.3".intern(); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java index bed5db598..38a475366 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -90,6 +90,7 @@ public AttributeTypeTest() throws Exception { } } + @Override @DataProvider(name = "equalsTestData") public Object[][] createEqualsTestData() throws SchemaException, DecodeException { return new Object[][] { @@ -535,6 +536,7 @@ public void testNoUserModNonOperational() throws Exception { Assert.assertFalse(builder.toSchema().getWarnings().isEmpty()); } + @Override protected SchemaElement getElement(final String description, final Map> extraProperties) throws SchemaException { final SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema()); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java index 444b46a90..58dd469d5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -36,6 +37,7 @@ @SuppressWarnings("javadoc") public class CaseIgnoreIA5SubstringMatchingRuleTest extends SubstringMatchingRuleTest { + @Override @DataProvider(name = "substringInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] { { "12345678\uFFFD", new String[0], null }, @@ -43,6 +45,7 @@ public Object[][] createMatchingRuleInvalidAssertionValues() { { null, strings(), "12345678\uFFFD" }, }; } + @Override @DataProvider(name = "substringInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { { "12345678\uFFFD" }, }; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java index bf0431feb..927817314 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -36,11 +37,13 @@ @SuppressWarnings("javadoc") public class CaseIgnoreSubstringMatchingRuleTest extends SubstringMatchingRuleTest { + @Override @DataProvider(name = "substringInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] {}; } + @Override @DataProvider(name = "substringInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java index a7d7651ff..2851ae675 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -39,11 +39,13 @@ @Test public class CollationSubstringMatchingRuleTest extends SubstringMatchingRuleTest { + @Override @DataProvider(name = "substringInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] { }; } + @Override @DataProvider(name = "substringInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java index c0e700f30..121566bbd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -40,6 +40,7 @@ */ @SuppressWarnings("javadoc") public class DistinguishedNameEqualityMatchingRuleTest extends MatchingRuleTest { + @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { { "manager" }, { "manager " }, @@ -66,6 +67,7 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { { "cn=,dc=example,dc=com" } }; } + @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { return new Object[][] { @@ -184,6 +186,7 @@ public Object[][] createData() { { "O=\"Sue, Grabbit and Runn\",C=US", "c=us\u0000o=sue\u002C grabbit and runn" }, }; } + @Override protected MatchingRule getRule() { return CoreSchema.getDistinguishedNameMatchingRule(); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java index 6c652493c..33d429114 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Portions Copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap.schema; @@ -1132,6 +1132,7 @@ private Entry newEntry(final String... ldif) { private EntryResolver newResolver(final Entry e) { return new EntryResolver() { + @Override public Entry getEntry(final DN dn) throws LdapException { if (e == null) { throw newLdapException(ResultCode.NO_SUCH_OBJECT, "no such entry " + dn); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java index ac2a722ce..deca83356 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -67,6 +67,7 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } + @Override @DataProvider(name = "matchingRuleInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] { diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java index ff05a00c5..2c33169a6 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -67,6 +67,7 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } + @Override @DataProvider(name = "matchingRuleInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] { diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java index 5a02902f3..dd0c5175a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -67,6 +67,7 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } + @Override @DataProvider(name = "matchingRuleInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { return new Object[][] { diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java index 52e76a225..dafb5cdfc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2013-2014 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; @@ -260,6 +260,7 @@ public void testReentrantClose() { final ConnectionState state = new ConnectionState(); final ConnectionEventListener listener1 = mock(ConnectionEventListener.class); doAnswer(new Answer() { + @Override public Void answer(InvocationOnMock invocation) { state.notifyConnectionClosed(); return null; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java index 4cefd970a..58e0e44a3 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; @@ -51,6 +51,7 @@ private final class ChildSequenceLimiter implements SequenceLimiter { private int readLimit; private int bytesRead; + @Override public void checkLimit(final int readSize) throws IOException { if (0 < readLimit && readLimit < bytesRead + readSize) { final LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTE.get(); @@ -60,6 +61,7 @@ public void checkLimit(final int readSize) throws IOException { bytesRead += readSize; } + @Override public SequenceLimiter endSequence() throws IOException { parent.checkLimit(remaining()); if (remaining() > 0) { @@ -72,10 +74,12 @@ public SequenceLimiter endSequence() throws IOException { return parent; } + @Override public int remaining() { return readLimit - bytesRead; } + @Override public ChildSequenceLimiter startSequence(final int readLimit) { if (child == null) { child = new ChildSequenceLimiter(); @@ -90,6 +94,7 @@ public ChildSequenceLimiter startSequence(final int readLimit) { private final class RootSequenceLimiter implements SequenceLimiter { private ChildSequenceLimiter child; + @Override public void checkLimit(final int readSize) throws IOException { if (buffer.remaining() < readSize) { final LocalizableMessage message = ERR_ASN1_TRUNCATED_LENGTH_BYTE.get(); @@ -97,15 +102,18 @@ public void checkLimit(final int readSize) throws IOException { } } + @Override public ChildSequenceLimiter endSequence() throws DecodeException { final LocalizableMessage message = ERR_ASN1_SEQUENCE_READ_NOT_STARTED.get(); throw new IllegalStateException(message.toString()); } + @Override public int remaining() { return buffer.remaining(); } + @Override public ChildSequenceLimiter startSequence(final int readLimit) { if (child == null) { child = new ChildSequenceLimiter(); @@ -162,6 +170,7 @@ private interface SequenceLimiter { * @throws IOException * if an I/O error occurs */ + @Override public void close() throws IOException { buffer.dispose(); } @@ -175,6 +184,7 @@ public void close() throws IOException { * @throws IOException * If an error occurs while trying to decode an ASN1 element. */ + @Override public boolean elementAvailable() throws IOException { return (state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true)) && (state != ASN1.ELEMENT_READ_STATE_NEED_FIRST_LENGTH_BYTE || needFirstLengthByteState(true)) @@ -192,11 +202,12 @@ public boolean elementAvailable() throws IOException { * @throws IOException * If an error occurs while trying to decode an ASN1 element. */ + @Override public boolean hasNextElement() throws IOException { return state != ASN1.ELEMENT_READ_STATE_NEED_TYPE || needTypeState(true); } - /** {@inheritDoc} */ + @Override public int peekLength() throws IOException { peekType(); @@ -212,7 +223,7 @@ public int peekLength() throws IOException { return peekLength; } - /** {@inheritDoc} */ + @Override public byte peekType() throws IOException { if (state == ASN1.ELEMENT_READ_STATE_NEED_TYPE) { needTypeState(false); @@ -221,7 +232,7 @@ public byte peekType() throws IOException { return peekType; } - /** {@inheritDoc} */ + @Override public boolean readBoolean() throws IOException { // Read the header if haven't done so already peekLength(); @@ -240,7 +251,7 @@ public boolean readBoolean() throws IOException { return readByte != 0x00; } - /** {@inheritDoc} */ + @Override public void readEndSequence() throws IOException { readLimiter = readLimiter.endSequence(); @@ -250,20 +261,19 @@ public void readEndSequence() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ @Override public void readEndExplicitTag() throws DecodeException, IOException { readEndSequence(); } - /** {@inheritDoc} */ + @Override public void readEndSet() throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. readEndSequence(); } - /** {@inheritDoc} */ + @Override public int readEnumerated() throws IOException { // Read the header if haven't done so already peekLength(); @@ -278,7 +288,7 @@ public int readEnumerated() throws IOException { return (int) readInteger(); } - /** {@inheritDoc} */ + @Override public long readInteger() throws IOException { // Read the header if haven't done so already peekLength(); @@ -318,7 +328,7 @@ public long readInteger() throws IOException { } } - /** {@inheritDoc} */ + @Override public void readNull() throws IOException { // Read the header if haven't done so already peekLength(); @@ -334,7 +344,7 @@ public void readNull() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ + @Override public ByteString readOctetString() throws IOException { // Read the header if haven't done so already peekLength(); @@ -355,7 +365,7 @@ public ByteString readOctetString() throws IOException { return ByteString.wrap(value); } - /** {@inheritDoc} */ + @Override public ByteStringBuilder readOctetString(final ByteStringBuilder builder) throws IOException { // Read the header if haven't done so already peekLength(); @@ -378,7 +388,7 @@ public ByteStringBuilder readOctetString(final ByteStringBuilder builder) throws return builder; } - /** {@inheritDoc} */ + @Override public String readOctetStringAsString() throws IOException { // Read the header if haven't done so already peekLength(); @@ -415,7 +425,7 @@ public String readOctetStringAsString() throws IOException { return str; } - /** {@inheritDoc} */ + @Override public void readStartSequence() throws IOException { // Read the header if haven't done so already peekLength(); @@ -428,20 +438,19 @@ public void readStartSequence() throws IOException { state = ASN1.ELEMENT_READ_STATE_NEED_TYPE; } - /** {@inheritDoc} */ @Override public void readStartExplicitTag() throws DecodeException, IOException { readStartSequence(); } - /** {@inheritDoc} */ + @Override public void readStartSet() throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. readStartSequence(); } - /** {@inheritDoc} */ + @Override public ASN1Reader skipElement() throws IOException { // Read the header if haven't done so already peekLength(); diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java index 740e24f6f..173d560eb 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; @@ -51,6 +51,7 @@ private class ChildSequenceBuffer implements SequenceBuffer { private ChildSequenceBuffer child; private final ByteStringBuilder buffer = new ByteStringBuilder(BUFFER_INIT_SIZE); + @Override public SequenceBuffer endSequence() throws IOException { writeLength(parent, buffer.length()); parent.writeByteArray(buffer.getBackingArray(), 0, buffer.length()); @@ -59,6 +60,7 @@ public SequenceBuffer endSequence() throws IOException { return parent; } + @Override public SequenceBuffer startSequence(final byte type) throws IOException { if (child == null) { child = new ChildSequenceBuffer(); @@ -69,10 +71,12 @@ public SequenceBuffer startSequence(final byte type) throws IOException { return child; } + @Override public void writeByte(final byte b) throws IOException { buffer.appendByte(b); } + @Override public void writeByteArray(final byte[] bs, final int offset, final int length) throws IOException { buffer.appendBytes(bs, offset, length); } @@ -112,11 +116,13 @@ public void ensureAdditionalCapacity(final int size) { private class RootSequenceBuffer implements SequenceBuffer { private ChildSequenceBuffer child; + @Override public SequenceBuffer endSequence() throws IOException { final LocalizableMessage message = ERR_ASN1_SEQUENCE_WRITE_NOT_STARTED.get(); throw new IllegalStateException(message.toString()); } + @Override public SequenceBuffer startSequence(final byte type) throws IOException { if (child == null) { child = new ChildSequenceBuffer(); @@ -128,11 +134,13 @@ public SequenceBuffer startSequence(final byte type) throws IOException { return child; } + @Override public void writeByte(final byte b) throws IOException { outBuffer.ensureAdditionalCapacity(1); outBuffer.put(b); } + @Override public void writeByteArray(final byte[] bs, final int offset, final int length) throws IOException { outBuffer.ensureAdditionalCapacity(length); @@ -152,19 +160,12 @@ private interface SequenceBuffer { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * Initial size of newly created buffers. - */ + /** Initial size of newly created buffers. */ private static final int BUFFER_INIT_SIZE = 1024; - - /** - * Default maximum size for cached protocol/entry encoding buffers. - */ + /** Default maximum size for cached protocol/entry encoding buffers. */ private static final int DEFAULT_MAX_INTERNAL_BUFFER_SIZE = 32 * 1024; - /** - * Reset the writer. - */ + /** Reset the writer. */ void reset() { if (!outBuffer.usable) { // If the output buffer is unusable, create a new one. @@ -177,9 +178,7 @@ void reset() { private RecyclableBuffer outBuffer; private final RootSequenceBuffer rootBuffer; - /** - * Creates a new ASN.1 writer that writes to a StreamWriter. - */ + /** Creates a new ASN.1 writer that writes to a StreamWriter. */ ASN1BufferWriter() { this.sequenceBuffer = this.rootBuffer = new RootSequenceBuffer(); this.outBuffer = new RecyclableBuffer(); @@ -192,6 +191,7 @@ void reset() { * @throws IOException * if an error occurs while closing the stream. */ + @Override public void close() throws IOException { outBuffer = null; } @@ -202,19 +202,19 @@ public void close() throws IOException { * @throws IOException * If an I/O error occurs */ + @Override public void flush() throws IOException { // Do nothing } - /** - * Recycle the writer to allow re-use. - */ + /** Recycle the writer to allow re-use. */ + @Override public void recycle() { sequenceBuffer = rootBuffer; outBuffer.clear(); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeBoolean(final byte type, final boolean booleanValue) throws IOException { sequenceBuffer.writeByte(type); writeLength(sequenceBuffer, 1); @@ -224,24 +224,24 @@ public ASN1Writer writeBoolean(final byte type, final boolean booleanValue) thro return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeEndSequence() throws IOException { sequenceBuffer = sequenceBuffer.endSequence(); return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeEndSet() throws IOException { return writeEndSequence(); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeEnumerated(final byte type, final int intValue) throws IOException { return writeInteger(type, intValue); } - /** {@inheritDoc} */ + @Override public ASN1Writer writeInteger(final byte type, final int intValue) throws IOException { sequenceBuffer.writeByte(type); if (((intValue < 0) && ((intValue & 0xFFFFFF80) == 0xFFFFFF80)) @@ -273,7 +273,7 @@ public ASN1Writer writeInteger(final byte type, final int intValue) throws IOExc return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeInteger(final byte type, final long longValue) throws IOException { sequenceBuffer.writeByte(type); if (((longValue < 0) && ((longValue & 0xFFFFFFFFFFFFFF80L) == 0xFFFFFFFFFFFFFF80L)) @@ -347,7 +347,7 @@ public ASN1Writer writeInteger(final byte type, final long longValue) throws IOE return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeNull(final byte type) throws IOException { sequenceBuffer.writeByte(type); writeLength(sequenceBuffer, 0); @@ -356,7 +356,7 @@ public ASN1Writer writeNull(final byte type) throws IOException { return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final byte type, final byte[] value, final int offset, final int length) throws IOException { sequenceBuffer.writeByte(type); @@ -367,7 +367,7 @@ public ASN1Writer writeOctetString(final byte type, final byte[] value, final in return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final byte type, final ByteSequence value) throws IOException { sequenceBuffer.writeByte(type); @@ -381,7 +381,7 @@ public ASN1Writer writeOctetString(final byte type, final ByteSequence value) return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeOctetString(final byte type, final String value) throws IOException { sequenceBuffer.writeByte(type); @@ -398,7 +398,7 @@ public ASN1Writer writeOctetString(final byte type, final String value) throws I return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeStartSequence(final byte type) throws IOException { // Get a child sequence buffer sequenceBuffer = sequenceBuffer.startSequence(type); @@ -407,7 +407,7 @@ public ASN1Writer writeStartSequence(final byte type) throws IOException { return this; } - /** {@inheritDoc} */ + @Override public ASN1Writer writeStartSet(final byte type) throws IOException { // From an implementation point of view, a set is equivalent to a // sequence. diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java index f7270503f..ee8211e9d 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; @@ -55,10 +55,12 @@ public Decoder(final ConnectionSecurityLayer layer, final MemoryManager memor setMemoryManager(memoryManager); } + @Override public String getName() { return getClass().getName(); } + @Override public boolean hasInputRemaining(final AttributeStorage storage, final Buffer input) { return input != null && input.hasRemaining(); } @@ -94,10 +96,12 @@ private Encoder(final ConnectionSecurityLayer layer, final MemoryManager memo setMemoryManager(memoryManager); } + @Override public String getName() { return getClass().getName(); } + @Override public boolean hasInputRemaining(final AttributeStorage storage, final Buffer input) { return input != null && input.hasRemaining(); } diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java index ce328effa..24f80a093 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; @@ -110,6 +110,7 @@ void setFilterChainContext(FilterChainContext context) { * * @return the reader to read incoming LDAP messages */ + @Override public LDAPReader getReader() { return this.reader; } diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java index 1aea651ba..c9e1ba64e 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/DataSource.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.ldap.tools; @@ -71,10 +71,12 @@ private IncrementLineFileDataSource(final List lines) { this.lines = lines; } + @Override public IDataSource duplicate() { return new IncrementLineFileDataSource(lines); } + @Override public Object getData() { if (next == lines.size()) { next = 0; @@ -99,10 +101,12 @@ public IncrementNumberDataSource(final int low, final int high) { this.high = high; } + @Override public IDataSource duplicate() { return new IncrementNumberDataSource(low, high); } + @Override public Object getData() { if (next == high) { next = low; @@ -132,10 +136,12 @@ public RandomLineFileDataSource(final long seed, final String file) throws IOExc } } + @Override public IDataSource duplicate() { return this; } + @Override public Object getData() { return lines.get(random.nextInt(lines.size())); } @@ -156,11 +162,13 @@ public RandomNumberDataSource(final long seed, final int low, final int high) { range = high - low; } + @Override public IDataSource duplicate() { // There is no state info so threads can just share one instance. return this; } + @Override public Object getData() { return random.nextInt(range) + offset; } @@ -197,10 +205,12 @@ private RandomStringDataSource(final int seed, final int length, final String ch this.random = new Random(seed); } + @Override public IDataSource duplicate() { return this; } + @Override public Object getData() { final char[] str = new char[length]; for (int i = 0; i < length; i++) { @@ -227,11 +237,13 @@ private StaticDataSource(final Object data) { this.data = data; } + @Override public IDataSource duplicate() { // There is no state info so threads can just share one instance. return this; } + @Override public Object getData() { return data; } From c5b11f44fc54b062a45b3894f394267bed81e023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 6 Jan 2016 11:57:47 +0100 Subject: [PATCH 014/125] Fix eclipse warnings --- .../forgerock/maven/UpdateCopyrightMojo.java | 3 +- .../AnonymousSASLBindRequestImpl.java | 9 ++---- .../forgerock/opendj/ldap/schema/Schema.java | 3 +- ...CaseExactIA5SubstringMatchingRuleTest.java | 10 ++----- .../CaseExactSubstringMatchingRuleTest.java | 10 ++----- ...aseIgnoreIA5SubstringMatchingRuleTest.java | 9 +----- .../CaseIgnoreSubstringMatchingRuleTest.java | 9 +----- ...umericStringSubstringMatchingRuleTest.java | 10 ++----- .../ldif/ConnectionEntryWriterTestCase.java | 28 +++++-------------- .../forgerock/opendj/ldif/LDIFTestCase.java | 17 ++--------- .../GenerateConfigurationReferenceMojo.java | 6 ++-- .../doc/GenerateGlobalAcisTableMojo.java | 5 +--- .../maven/doc/GenerateMessageFileMojo.java | 8 ++---- .../opendj/examples/ProxyBackend.java | 4 +-- 14 files changed, 31 insertions(+), 100 deletions(-) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java index 0c8d61fa8..c094533c9 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java @@ -445,7 +445,6 @@ void setCopyrightEndToken(String copyrightEndToken) { } void setDryRun(final boolean dryRun) { - this.dryRun = true; + this.dryRun = dryRun; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java index 92611055a..36e8f457f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java @@ -22,13 +22,11 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.requests; import org.forgerock.opendj.ldap.ByteString; - import org.forgerock.util.Reject; /** @@ -37,8 +35,7 @@ final class AnonymousSASLBindRequestImpl extends AbstractSASLBindRequest implements AnonymousSASLBindRequest { private static final class Client extends SASLBindClientImpl { - private Client(final AnonymousSASLBindRequestImpl initialBindRequest, - final String serverName) { + private Client(final AnonymousSASLBindRequestImpl initialBindRequest) { super(initialBindRequest); setNextSASLCredentials(ByteString.valueOfUtf8(initialBindRequest.getTraceString())); } @@ -58,7 +55,7 @@ private Client(final AnonymousSASLBindRequestImpl initialBindRequest, @Override public BindClient createBindClient(final String serverName) { - return new Client(this, serverName); + return new Client(this); } @Override diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java index 7d0f96a9d..39504b1cf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java @@ -1014,8 +1014,7 @@ public static Schema readSchemaForEntry(final Connection connection, final DN na *

* This implementation first reads the {@code subschemaSubentry} attribute * of the entry in order to identify the schema and then invokes - * {@link #readSchemaAsync(Connection, DN, ResultHandler)} to read the - * schema. + * {@link #readSchemaAsync(Connection, DN)} to read the schema. * * @param connection * A connection to the Directory Server whose schema is to be diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java index fccd3e02f..380363d72 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -30,10 +31,7 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseExactIA5SubstringMatchingRule. - */ -@SuppressWarnings("javadoc") +/** Test the CaseExactIA5SubstringMatchingRule. */ public class CaseExactIA5SubstringMatchingRuleTest extends SubstringMatchingRuleTest { @Override @@ -51,7 +49,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { { "12345678\uFFFD" }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -69,7 +66,6 @@ public Object[][] createSubstringFinalMatchData() { { "end with space ", "space", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -85,7 +81,6 @@ public Object[][] createSubstringInitialMatchData() { { "this is a value", "THIS", ConditionResult.FALSE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -107,7 +102,6 @@ public Object[][] createSubstringMiddleMatchData() { { "this is a value", strings(" "), ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(SMR_CASE_EXACT_IA5_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java index bbbaf3872..2a3de9fe8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -30,10 +31,7 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseExactSubstringMatchingRule class. - */ -@SuppressWarnings("javadoc") +/** Test the CaseExactSubstringMatchingRule class. */ public class CaseExactSubstringMatchingRuleTest extends SubstringMatchingRuleTest { @Override @@ -48,7 +46,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -66,7 +63,6 @@ public Object[][] createSubstringFinalMatchData() { { "end with space ", "space", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -82,7 +78,6 @@ public Object[][] createSubstringInitialMatchData() { { "this is a value", "THIS", ConditionResult.FALSE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -104,7 +99,6 @@ public Object[][] createSubstringMiddleMatchData() { { "this is a value", strings(" "), ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(SMR_CASE_EXACT_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java index 58dd469d5..7971e4242 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java @@ -31,10 +31,7 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseIgnoreIA5SubstringMatchingRule. - */ -@SuppressWarnings("javadoc") +/** Test the CaseIgnoreIA5SubstringMatchingRule. */ public class CaseIgnoreIA5SubstringMatchingRuleTest extends SubstringMatchingRuleTest { @Override @@ -51,7 +48,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { { "12345678\uFFFD" }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -75,7 +71,6 @@ public Object[][] createSubstringFinalMatchData() { { "end with space ", "SPACE", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -95,7 +90,6 @@ public Object[][] createSubstringInitialMatchData() { { "this is a value", "THIS", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -121,7 +115,6 @@ public Object[][] createSubstringMiddleMatchData() { { "this is a value", strings(" "), ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(SMR_CASE_IGNORE_IA5_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java index 927817314..fc192fb0b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java @@ -31,10 +31,7 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseIgnoreSubstringMatchingRule. - */ -@SuppressWarnings("javadoc") +/** Test the CaseIgnoreSubstringMatchingRule. */ public class CaseIgnoreSubstringMatchingRuleTest extends SubstringMatchingRuleTest { @Override @@ -49,7 +46,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -73,7 +69,6 @@ public Object[][] createSubstringFinalMatchData() { { "end with space ", "SPACE", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -93,7 +88,6 @@ public Object[][] createSubstringInitialMatchData() { { "this is a value", "THIS", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -119,7 +113,6 @@ public Object[][] createSubstringMiddleMatchData() { { "this is a value", strings(" "), ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(SMR_CASE_IGNORE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java index e3bbce316..bb006801b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java @@ -22,6 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -31,10 +32,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the NumericStringSubstringMatchingRule. - */ -@SuppressWarnings("javadoc") +/** Test the NumericStringSubstringMatchingRule. */ @Test public class NumericStringSubstringMatchingRuleTest extends SubstringMatchingRuleTest { @@ -52,7 +50,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -67,7 +64,6 @@ public Object[][] createSubstringFinalMatchData() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -84,7 +80,6 @@ public Object[][] createSubstringInitialMatchData() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -108,7 +103,6 @@ public Object[][] createSubstringMiddleMatchData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(SMR_NUMERIC_STRING_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java index 691fd7bcd..125a2ad77 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java @@ -22,9 +22,8 @@ * * * Copyright 2011 ForgeRock AS - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldif; import org.forgerock.opendj.ldap.Connection; @@ -56,7 +55,6 @@ public class ConnectionEntryWriterTestCase extends AbstractLDIFTestCase { @Test public final void testConnectionEntryWriterWritesEntry() throws Exception { Connection connection = mock(Connection.class); - ConnectionEntryWriter writer = null; final Entry entry = new LinkedHashMapEntry("cn=scarter,dc=example,dc=com").addAttribute("objectclass", @@ -78,13 +76,10 @@ public Result answer(final InvocationOnMock invocation) throws Throwable { } }); - try { - writer = new ConnectionEntryWriter(connection); + try (ConnectionEntryWriter writer = new ConnectionEntryWriter(connection)) { writer.writeComment("This is a test for the ConnectionEntryWriter"); writer.writeEntry(entry); verify(connection, times(1)).add(any(Entry.class)); - } finally { - writer.close(); } } @@ -95,12 +90,8 @@ public Result answer(final InvocationOnMock invocation) throws Throwable { */ @Test(expectedExceptions = NullPointerException.class) public final void testConnectionEntryWriterDoesntAllowNullComment() throws Exception { - ConnectionEntryWriter writer = null; - try { - writer = new ConnectionEntryWriter(null); + try (ConnectionEntryWriter writer = new ConnectionEntryWriter(null)) { writer.writeComment(null); - } finally { - writer.close(); } } @@ -111,11 +102,8 @@ public final void testConnectionEntryWriterDoesntAllowNullComment() throws Excep */ @Test(expectedExceptions = NullPointerException.class) public final void testConnectionEntryWriterDoesntAllowNull() throws Exception { - ConnectionEntryWriter writer = null; - try { - writer = new ConnectionEntryWriter(null); - } finally { - writer.close(); + try (ConnectionEntryWriter writer = new ConnectionEntryWriter(null)) { + // nothing to do } } @@ -128,11 +116,9 @@ public final void testConnectionEntryWriterDoesntAllowNull() throws Exception { @Test public final void testConnectionEntryWriterClose() throws Exception { Connection connection = mock(Connection.class); - ConnectionEntryWriter writer = null; - try { - writer = new ConnectionEntryWriter(connection); + try (ConnectionEntryWriter writer = new ConnectionEntryWriter(connection)) { + // nothing to do } finally { - writer.close(); verify(connection, times(1)).close(); } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java index 0472f2c43..be604530a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java @@ -22,9 +22,8 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldif; import java.io.File; @@ -684,13 +683,8 @@ public final void testLdifNewEntryCollectionReader() throws Exception { */ @Test(expectedExceptions = NullPointerException.class) public final void testLdifNewEntryCollectionDoesntAllowNull() throws Exception { - - EntryReader resultReader = null; - try { - resultReader = LDIF.newEntryCollectionReader(null); + try (EntryReader resultReader = LDIF.newEntryCollectionReader(null)) { resultReader.readEntry(); - } finally { - resultReader.close(); } } @@ -739,13 +733,8 @@ public final void testLdifNewEntryIteratorReader() throws Exception { */ @Test(expectedExceptions = NullPointerException.class) public final void testLdifNewEntryIteratorReaderDoesntAllowsNull() throws Exception { - - EntryReader resultReader = null; - try { - resultReader = LDIF.newEntryIteratorReader(null); + try (EntryReader resultReader = LDIF.newEntryIteratorReader(null)) { resultReader.readEntry(); - } finally { - resultReader.close(); } } diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java index 1498ae5d2..ec0a96975 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; @@ -54,7 +54,7 @@ public class GenerateConfigurationReferenceMojo extends AbstractMojo { /** * The path to the directory where the configuration reference should be written. - * This path must be under {@code ${project.build.directory} }. + * This path must be under ${project.build.directory}. */ @Parameter(defaultValue = "${project.build.directory}/site/configref") private String outputDirectory; @@ -77,7 +77,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { /** * Creates the output directory where the configuration reference is written. - * @throws MojoExecutionException The output directory is not under {@code ${project.build.directory} } + * @throws MojoExecutionException The output directory is not under ${project.build.directory} * or could not be created. */ private void createOutputDirectory() throws MojoExecutionException { diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java index 67e0c2f77..cda91ee58 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java @@ -20,7 +20,7 @@ * * CDDL HEADER END * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; @@ -67,9 +67,6 @@ public class GenerateGlobalAcisTableMojo extends AbstractMojo { @Parameter(defaultValue = "${project.build.directory}/docbkx-sources/shared") private File outputDirectory; - /** Holds descriptions for ACIs. */ - private Map descriptions; - /** Holds documentation for an ACI. */ private class Aci { String name; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java index c0a036fcf..2b014f9bf 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java @@ -22,7 +22,7 @@ * * * Copyright 2008-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; @@ -361,10 +361,8 @@ public void execute() throws MojoExecutionException, MojoFailureException { private void createOutputDirectory() throws IOException { File outputDir = new File(outputDirectory); - if (outputDir != null && !outputDir.exists()) { - if (!outputDir.mkdirs()) { - throw new IOException("Failed to create output directory."); - } + if (!outputDir.exists() && !outputDir.mkdirs()) { + throw new IOException("Failed to create output directory."); } } diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java index b9dfdf98d..4c49de689 100644 --- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java +++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java @@ -22,9 +22,8 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.examples; import java.util.concurrent.atomic.AtomicReference; @@ -78,7 +77,6 @@ * client connection. The following code illustrates how this may be achieved: * * 

- *     {@code
  * final RequestHandlerFactory proxyFactory =
  *     new RequestHandlerFactory() {
  *         @Override

From c9b49f7bcfae7c59201eb5adae8a13cc2c1d5553 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Wed, 6 Jan 2016 13:05:54 +0100
Subject: [PATCH 015/125] Cleanup in pom files

* Move copyright-maven-plugin executions to the repositority parent pom
to allow copyright checks fail fast.
* Remove duplicated reporting section in opendj-sdk-parent/pom.xml file
---
 opendj-sdk-parent/pom.xml | 90 +--------------------------------------
 pom.xml                   | 67 ++++++++++++++++++++++++++++-
 2 files changed, 67 insertions(+), 90 deletions(-)

diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml
index 602f9bd3b..5bf8fad98 100644
--- a/opendj-sdk-parent/pom.xml
+++ b/opendj-sdk-parent/pom.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS.
+  !      Copyright 2011-2016 ForgeRock AS.
   !
 -->
 
@@ -309,92 +309,4 @@
             
         
     
-
-
-    
-        
-            
-                org.apache.maven.plugins
-                maven-project-info-reports-plugin
-                2.4
-                
-                    
-                        
-                            index
-                            mailing-list
-                            issue-tracking
-                            license
-                            scm
-                            cim
-                            distribution-management
-                        
-                    
-                
-            
-        
-    
-
-
-    
-        
-            precommit
-            
-                
-                    
-                        org.forgerock.opendj
-                        opendj-copyright-maven-plugin
-                        
-                            
-                                check-copyright
-                                
-                                    check-copyright
-                                
-                            
-                        
-                    
-                
-            
-        
-
-        
-            update-copyrights
-            
-                
-                    
-                        org.forgerock.opendj
-                        opendj-copyright-maven-plugin
-                        
-                            
-                                check-copyright
-                                none
-                                
-                                    check-copyright
-                                
-                            
-                            
-                                update-copyright
-                                
-                                    update-copyright
-                                
-                                
-                                    
-                                    
-                                        (CDDL HEADER END|\"Portions Copyright \[year\] \[name of copyright owner\]\")
-                                    
-                                
-                            
-                        
-                    
-                
-            
-        
-    
 
diff --git a/pom.xml b/pom.xml
index 88029f3f7..a0c1fa545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2015 ForgeRock AS.
+  !      Copyright 2015-2016 ForgeRock AS.
   !
 -->
 
@@ -230,4 +230,69 @@
             
         
     
+
+    
+        
+            precommit
+            
+                
+                    
+                        org.forgerock.opendj
+                        opendj-copyright-maven-plugin
+                        ${project.version}
+                        
+                            
+                                check-copyright
+                                
+                                    check-copyright
+                                
+                            
+                        
+                    
+                
+            
+        
+
+        
+            update-copyrights
+            
+                
+                    
+                        org.forgerock.opendj
+                        opendj-copyright-maven-plugin
+                        ${project.version}
+                        
+                            
+                                check-copyright
+                                none
+                                
+                                    check-copyright
+                                
+                            
+                            
+                                update-copyright
+                                
+                                    update-copyright
+                                
+                                
+                                    
+                                    
+                                        (CDDL HEADER END|\"Portions Copyright \[year\] \[name of copyright owner\]\")
+                                    
+                                
+                            
+                        
+                    
+                
+            
+        
+    
 

From 02025d725b3ee87d5f179b3fc87ecbd1a60f01b6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Wed, 6 Jan 2016 13:56:01 +0100
Subject: [PATCH 016/125] Improve copyright maven plugin

* Creates a parameter for the Git branch which is used against HEAD in
the diff command. And change its default value from master to
origin/master (Thanks to JNR for the tip).
* Also fix little bug (duplicate file name in the incorrect file list)
---
 .../org/forgerock/maven/CopyrightAbstractMojo.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index 878ead46e..3a2a6ead6 100644
--- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -88,6 +88,10 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo {
     @Parameter(required = true, defaultValue = "${project.scm.connection}")
     private String scmRepositoryUrl;
 
+    /** The Git master branch name of the repository. **/
+    @Parameter(required = true, defaultValue = "origin/master")
+    private String gitMasterBranchName;
+
     /**
      * List of file patterns for which copyright check and/or update will be skipped.
      * Pattern can contain the following wildcards (*, ?, **{@literal /}).
@@ -108,7 +112,7 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo {
     private static final List SUPPORTED_START_BLOCK_COMMENT_TOKEN = new LinkedList<>(Arrays.asList(
                     "/*", "
 
 
-  
-    org/forgerock/opendj/ldap/LDAPConnectionFactory
-    7002
-    LDAPConnectionFactory(java.net.SocketAddress)
-    Moving from inetSocketAddress to host+port constructors
-  
-  
-    org/forgerock/opendj/ldap/LDAPConnectionFactory
-    7002
-    LDAPConnectionFactory(java.net.SocketAddress, org.forgerock.opendj.ldap.LDAPOptions)
-    Moving from inetSocketAddress to host+port constructors
-  
-  
-    org/forgerock/opendj/ldap/LDAPConnectionFactory
-    7002
-    java.net.InetAddress getAddress()
-    Moving from inetSocketAddress to host+port constructors
-  
-  
-    org/forgerock/opendj/ldap/LDAPConnectionFactory
-    7002
-    java.net.SocketAddress getSocketAddress()
-    Moving from inetSocketAddress to host+port constructors
-  
-
-  
-    org/forgerock/opendj/ldap/CoreMessages
-    8001
-    Incorrectly reported because it is automatically generated
-  
-
-  
-    org/forgerock/opendj/ldap/Connections
-    7005
-    %regex[org\.forgerock\.opendj\.ldap\.ConnectionFactory newHeartBeatConnectionFactory\(org\.forgerock\.opendj\.ldap\.ConnectionFactory, long, java\.util\.concurrent\.TimeUnit, org\.forgerock\.opendj\.ldap\.requests\.SearchRequest(, java\.util\.concurrent\.ScheduledExecutorService)?\)]
-    %regex[org\.forgerock\.opendj\.ldap\.ConnectionFactory newHeartBeatConnectionFactory\(org\.forgerock\.opendj\.ldap\.ConnectionFactory,\s*long,\s*long,\s*java\.util\.concurrent\.TimeUnit(,\s*org\.forgerock\.opendj\.ldap\.requests\.SearchRequest(,\s*java\.util\.concurrent\.ScheduledExecutorService)?)?\)]
-    OPENDJ-1058: Added a timeout parameter to actively shutdown dead connections
-  
-  
-    org/forgerock/opendj/ldap/Connections
-    7004
-    org.forgerock.opendj.ldap.ConnectionFactory newHeartBeatConnectionFactory(org.forgerock.opendj.ldap.ConnectionFactory, long, java.util.concurrent.TimeUnit)
-    OPENDJ-1058: Added a timeout parameter to actively shutdown dead connections
-  
-  
-    org/forgerock/opendj/ldap/ErrorResultException
-    7005
-    %regex[org\.forgerock\.opendj\.ldap\.ErrorResultException newErrorResult\(org\.forgerock\.opendj\.ldap\.ResultCode, java\.lang\.String(, java\.lang\.Throwable)?\)]
-    %regex[org\.forgerock\.opendj\.ldap\.ErrorResultException newErrorResult\(org\.forgerock\.opendj\.ldap\.ResultCode, java\.lang\.CharSequence(, java\.lang\.Throwable)?\)]
-    OPENDJ-1058: Broadened the API by accepting java.lang.CharSequence while retaining source compatibility
-  
-  
-    %regex[org/forgerock/opendj/ldap/(LDAPConnectionFactory|LDAPListener)]
-    7002
-    java.lang.String getHostname()
-    OPENDJ-1270: Renamed LDAP{ConnectionFactory|Listener}.getHostname() to getHostName()
-  
-  
-    %regex[org/forgerock/opendj/ldap/(LDAPConnectionFactory|LDAPListener)]
-    7006
-    java.net.SocketAddress getSocketAddress()
-    java.net.InetSocketAddress
-    OPENDJ-1270: Changed LDAP{ConnectionFactory|Listener}.getAddress() to return InetSocketAddresses
-  
-  
-    org/forgerock/opendj/ldap/LDAPConnectionFactory
-    7005
-    %regex[LDAPConnectionFactory\(java\.lang\.String(.)*(org\.forgerock\.opendj\.ldap\.LDAPOptions)\)]
-    %regex[LDAPConnectionFactory\(java\.lang\.String(.)*(org\.forgerock\.util\.Options)\)]
-    OPENDJ-1654: LDAPOptions should be converted in a SchemaOptions style API
-  
-  
-    org/forgerock/opendj/ldap/LDAPListener
-    7005
-    %regex[LDAPListener\((.*), org\.forgerock\.opendj\.ldap\.ServerConnectionFactory(,\s*org\.forgerock\.opendj\.ldap\.LDAPListenerOptions)?\)]
-    %regex[LDAPListener\((.*)\s*org\.forgerock\.opendj\.ldap\.ServerConnectionFactory(,\s*org\.forgerock\.util\.Options)?\)]
-    OPENDJ-1654: LDAPOptions should be converted in a SchemaOptions style API
-  
-
-  
-    %regex[org/forgerock/opendj/ldap/(LDAPOptions|LDAPListenerOptions)]
-    7002
-    %regex[org\.glassfish\.grizzly\.nio\.transport\.TCPNIOTransport getTCPNIOTransport\(\)]
-    OPENDJ-346: Decoupled opendj-ldap-sdk from grizzly-framework
-  
-  
-    %regex[org/forgerock/opendj/ldap/(LDAPOptions|LDAPListenerOptions)]
-    7002
-    %regex[org\.forgerock\.opendj\.ldap\.(LDAPOptions|LDAPListenerOptions) setTCPNIOTransport\(org\.glassfish\.grizzly\.nio\.transport\.TCPNIOTransport\)]
-    OPENDJ-346: Decoupled opendj-ldap-sdk from grizzly-framework
-  
-
-  
-    %regex[org/forgerock/opendj/asn1/[^/]*]
-    8001
-    OPENDJ-175: Moved all classes from org.forgerock.opendj.asn1 package to org.forgerock.opendj.io package
-  
-  
-    org/forgerock/opendj/ldap/ByteSequence
-    7012
-    boolean isEmpty()
-    OPENDJ-701: Added method isEmpty() to interface ByteSequence
-  
-  
-    org/forgerock/opendj/ldap/requests/SearchRequest
-    7012
-    boolean isSingleEntrySearch()
-    OPENDJ-972: Added method isSingleEntrySearch() to interface SearchRequest
-  
-
-  
-    org/forgerock/opendj/ldap/schema/MatchingRule
-    7002
-    %regex[org\.forgerock\.opendj\.ldap\.Assertion getAssertion\(org\.forgerock\.opendj\.ldap\.ByteSequence, java\.util\.List, org\.forgerock\.opendj\.ldap\.ByteSequence\)]
-    Renamed getAssertion() to getSubstringAssertion()
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7002
-    %regex[org\.forgerock\.opendj\.ldap\.Assertion getAssertion\(org\.forgerock\.opendj\.ldap\.schema\.Schema, org\.forgerock\.opendj\.ldap\.ByteSequence, java\.util\.List, org\.forgerock\.opendj\.ldap\.ByteSequence\)]
-    Renamed getAssertion() to getSubstringAssertion()
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7012
-    %regex[org\.forgerock\.opendj\.ldap\.Assertion getSubstringAssertion\(org\.forgerock\.opendj\.ldap\.schema\.Schema, org\.forgerock\.opendj\.ldap\.ByteSequence, java\.util\.List, org\.forgerock\.opendj\.ldap\.ByteSequence\)]
-    Renamed getAssertion() to getSubstringAssertion()
-  
-
-  
-    org/forgerock/opendj/ldap/schema/SchemaValidationPolicy
-    7006
-    %regex[org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$Policy (checkAttributeValues|checkAttributesAndObjectClasses|checkDITContentRules|checkDITStructureRules|checkNameForms|requireSingleStructuralObjectClass)\(\)]
-    %regex[org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$Action]
-    Renamed SchemaValidationPolicy.Policy to SchemaValidationPolicy.Action
-  
-  
-    org/forgerock/opendj/ldap/schema/SchemaValidationPolicy
-    7005
-    %regex[org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy (checkAttributeValues|checkAttributesAndObjectClasses|checkDITContentRules|checkDITStructureRules|checkNameForms|requireSingleStructuralObjectClass)\(org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$Policy(, org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$EntryResolver)?\)]
-    %regex[org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy (checkAttributeValues|checkAttributesAndObjectClasses|checkDITContentRules|checkDITStructureRules|checkNameForms|requireSingleStructuralObjectClass)\(org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$Action(,\s*org\.forgerock\.opendj\.ldap\.schema\.SchemaValidationPolicy\$EntryResolver)?\)]
-    Renamed SchemaValidationPolicy.Policy to SchemaValidationPolicy.Action
-  
-  
-    org/forgerock/opendj/ldap/schema/SchemaValidationPolicy$Policy
-    8001
-    Renamed SchemaValidationPolicy.Policy to SchemaValidationPolicy.Action
-  
-
-  
-    org/forgerock/opendj/ldap/LDAPListenerOptions
-    7002
-    org.forgerock.opendj.ldap.LDAPListenerOptions setDecodeOptions(org.forgerock.opendj.ldap.DecodeOptions)
-    OPENDJ-1197: Method return type has changed due to reification
-  
-  
-    org/forgerock/opendj/ldap/LDAPOptions
-    7002
-    org.forgerock.opendj.ldap.LDAPOptions setDecodeOptions(org.forgerock.opendj.ldap.DecodeOptions)
-    OPENDJ-1197: Method return type has changed due to reification
-  
-
-  
-    org/forgerock/opendj/ldap/Assertion
-    7012
-    java.lang.Object createIndexQuery(org.forgerock.opendj.ldap.spi.IndexQueryFactory)
-    OPENDJ-1308 Migrate schema support: allows decoupling indexing from a specific backend
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7012
-    java.util.Collection getIndexers()
-    OPENDJ-1308 Migrate schema support: allows decoupling indexing from a specific backend
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7012
-    boolean isIndexingSupported()
-    OPENDJ-1308 Migrate schema support: allows decoupling indexing from a specific backend
-  
-  
-    org/forgerock/opendj/ldap/*Connection*
-    7004
-    org.forgerock.opendj.ldap.FutureResult *Async(*org.forgerock.opendj.ldap.ResultHandler)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/schema/Schema
-    7004
-    org.forgerock.opendj.ldap.FutureResult readSchema*Async*(org.forgerock.opendj.ldap.Connection, org.forgerock.opendj.ldap.DN, org.forgerock.opendj.ldap.ResultHandler)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/*Connection*
-    7006
-    org.forgerock.opendj.ldap.FutureResult *Async(*org.forgerock.opendj.ldap.ResultHandler)
-    org.forgerock.util.promise.Promise
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/Connection
-    7012
-    org.forgerock.opendj.ldap.FutureResult *Async(org.forgerock.opendj.*)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    %regex[org/forgerock/opendj/ldap/(RequestHandler|MemoryBackend)]
-    7004
-    *handleSearch(*)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/ResultHandler
-    7012
-    *handleError(org.forgerock.opendj.ldap.ErrorResultException)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/ResultHandler
-    7002
-    *handleErrorResult(org.forgerock.opendj.ldap.ErrorResultException)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/SearchResultHandler
-    4001
-    org/forgerock/opendj/ldap/ResultHandler
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/schema/SchemaBuilder
-    7004
-    org.forgerock.opendj.ldap.FutureResult addSchema*Async(*)
-    OPENDJ-1285 Migrate SDK from Futures to Promises
-  
-  
-    org/forgerock/opendj/ldap/*Exception
-    5001
-    org/forgerock/opendj/ldap/ErrorResultException
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/*Exception
-    5001
-    java/util/concurrent/ExecutionException
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/ConnectionEventListener
-    7005
-    *handleConnectionError(boolean, org.forgerock.opendj.ldap.ErrorResultException)
-    *handleConnectionError(boolean, org.forgerock.opendj.ldap.LdapException)
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/ResultHandler
-    7012
-    *handleError(org.forgerock.opendj.ldap.LdapException)
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/ErrorResult*Exception
-    8001
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/*Connection*
-    7006
-    *Async*
-    org.forgerock.opendj.ldap.LdapPromise
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/RootDSE
-    7006
-    *Async*
-    org.forgerock.opendj.ldap.LdapPromise
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/schema/Schema*
-    7006
-    *Async*
-    org.forgerock.opendj.ldap.LdapPromise
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/Connection
-    7012
-    org.forgerock.opendj.ldap.LdapPromise *Async(*)
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/FutureResult
-    8001
-    OPENDJ-1536 Rename FutureResult and ErrorResultException classes hierarchy in the SDK to enhance code consistency
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7002
-    *composeFirstP(*)
-    OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7002
-    *composeSecondP(*)
-    OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7002
-    *fixedFunction(*)
-    OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-  
-  
-    org/forgerock/opendj/ldap/Function
-    8001
-    OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-  
-  
-    org/forgerock/opendj/ldap/AttributeParser
-    7005
-    *as*(org.forgerock.opendj.ldap.Function*)
-    *as*(org.forgerock.util.Function*)
-    
-        OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-        OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-    
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7005
-    *compose(org.forgerock.opendj.ldap.Function, org.forgerock.opendj.ldap.Function)
-    *compose(org.forgerock.util.Function, org.forgerock.util.Function)
-    
-        OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-        OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-    
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7006
-    *
-    org.forgerock.util.promise.Function
-    OPENDJ-1550 Replace SDK Function with Function from forgerock-util
-  
-  
-    org/forgerock/opendj/ldap/DN
-    7002
-    *toNormalizedString()
-    *toIrreversibleNormalizedByteString()
-    OPENDJ-1585 Function has been renamed to avoid abuse
-  
-  
-    %regex[org/forgerock/opendj/ldap/schema/Schema(Builder)?]
-    7002
-    %regex[(boolean|org.forgerock.opendj.ldap.schema.SchemaBuilder) allow(.)*\((boolean)?\)]
-    OPENDJ-1478 Make it easier to add compatibility options to schemas
-  
-  
-    org/forgerock/opendj/ldap/ByteSequence
-    7012
-    java.nio.ByteBuffer copyTo(java.nio.ByteBuffer)
-    Added new utility method copyTo() for a byte buffer
-  
-  
-    org/forgerock/opendj/ldap/ByteSequence
-    7012
-    boolean copyTo(java.nio.CharBuffer, java.nio.charset.CharsetDecoder)
-    OPENDJ-1585: Added new utility method copyTo for a char buffer
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRule
-    7002
-    java.util.Comparator comparator()
-    OPENDJ-1689 method has been removed because all matching rules should support the default comparator
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7002
-    java.util.Comparator comparator(org.forgerock.opendj.ldap.schema.Schema)
-    OPENDJ-1689 method has been removed because all matching rules should support the default comparator
-  
-  
-    org/forgerock/opendj/ldap/schema/MatchingRuleImpl
-    7012
-    java.util.Collection createIndexers(org.forgerock.opendj.ldap.spi.IndexingOptions)
-    Doesn't really seem correct to call createKeys() with different options each time.
-  
-  
-    org/forgerock/opendj/ldap/ByteSequence
-    7012
-    boolean startsWith(org.forgerock.opendj.ldap.ByteSequence)
-    Lack of startsWith() forced to re-implement it multiple times at different location
-  
-  
-    org/forgerock/opendj/ldap/ByteString
-    7005
-    org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)
-    org.forgerock.opendj.ldap.ByteString valueOf(java.lang.String)
-    org.forgerock.opendj.ldap.ByteString valueOf(java.lang.CharSequence)
-    Using CharSequence instead of String allows to reduce memory copy.
-  
-
-  
-  
-    org/forgerock/opendj/ldap/Functions
-    7006
-    *
-    org.forgerock.util.Function
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    org/forgerock/opendj/ldap/LdapResultHandler
-    8000
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    %regex[org/forgerock/opendj/ldap/(RequestHandler|MemoryBackend)]
-    7005
-    %regex[(.)* handle*(.)*org\.forgerock\.opendj\.ldap\.ResultHandler(.)*]
-    %regex[(.)* handle*(.)*org\.forgerock\.opendj\.ldap\.LdapResultHandler(.)*]
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    %regex[org/forgerock/opendj/ldap/responses/(Abstract)?ExtendedResultDecoder]
-    7006
-    org.forgerock.opendj.ldap.ResultHandler adaptExtendedResultHandler(org.forgerock.opendj.ldap.requests.ExtendedRequest, org.forgerock.opendj.ldap.ResultHandler, org.forgerock.opendj.ldap.DecodeOptions)
-    org.forgerock.opendj.ldap.LdapResultHandler
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    %regex[org/forgerock/opendj/ldap/responses/(Abstract)?ExtendedResultDecoder]
-    7005
-    org.forgerock.opendj.ldap.ResultHandler adaptExtendedResultHandler(org.forgerock.opendj.ldap.requests.ExtendedRequest, org.forgerock.opendj.ldap.ResultHandler, org.forgerock.opendj.ldap.DecodeOptions)
-    org.forgerock.opendj.ldap.ResultHandler adaptExtendedResultHandler(org.forgerock.opendj.ldap.requests.ExtendedRequest, org.forgerock.opendj.ldap.LdapResultHandler, org.forgerock.opendj.ldap.DecodeOptions)
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    org/forgerock/opendj/ldap/RootDSE
-    7005
-    *readRootDSEAsync(org.forgerock.opendj.ldap.Connection, org.forgerock.opendj.ldap.ResultHandler)
-    *readRootDSEAsync(org.forgerock.opendj.ldap.Connection, org.forgerock.opendj.ldap.LdapResultHandler)
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    org/forgerock/opendj/ldap/AuthenticatedConnectionFactory$AuthenticatedConnection
-    7005
-    *bindAsync(org.forgerock.opendj.ldap.requests.BindRequest, org.forgerock.opendj.ldap.IntermediateResponseHandler, org.forgerock.opendj.ldap.ResultHandler)
-    *bindAsync(org.forgerock.opendj.ldap.requests.BindRequest*org.forgerock.opendj.ldap.IntermediateResponseHandler*org.forgerock.opendj.ldap.LdapResultHandler)
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    org/forgerock/opendj/ldap/ResultHandler
-    8001
-    OPENDJ-1666 Update sdk to forgerock-util 2.0.0
-  
-  
-    org/forgerock/opendj/ldap/LDAPListenerOptions
-    8001
-    OPENDJ-1654: LDAPOptions should be converted in a SchemaOptions style API
-  
-  
-    org/forgerock/opendj/ldap/LDAPOptions
-    8001
-    OPENDJ-1654: LDAPOptions should be converted in a SchemaOptions style API
-  
-  
-    org/forgerock/opendj/ldap/ByteStringBuilder
-    7002
-    %regex[(org\.forgerock\.opendj\.ldap\.ByteStringBuilder|int) append\(.*\)]
-    OPENDJ-1802 ByteStringBuilder.append() => appendByte(), appendShort(), appendInt(), appendLong(), appendBytes(), appendObject()
-  
-  
-    org/forgerock/opendj/ldap/ByteStringBuilder
-    7004
-    org.forgerock.opendj.ldap.ByteStringBuilder append(byte)
-    org.forgerock.opendj.ldap.ByteStringBuilder appendByte(int)
-    OPENDJ-1802 Consider making ByteString / ByteStringBuilder methods more intentional
-  
-  
-    org/forgerock/opendj/ldap/ByteStringBuilder
-    7006
-    org.forgerock.opendj.ldap.ByteStringBuilder append(byte)
-    void
-    OPENDJ-1802 Consider making ByteString / ByteStringBuilder methods more intentional
-  
-  
-    org/forgerock/opendj/ldap/ByteSequenceReader
-    7002
-    %regex[(\w|\.)+ get\w*\([^)]*\)]
-    OPENDJ-1802 ByteSequenceReader.get*() => readByte(), readBytes() and read*()
-  
-  
-    org/forgerock/opendj/ldap/ByteString
-    7002
-    %regex[org\.forgerock\.opendj\.ldap\.ByteString valueOf\([^)]+\)]
-    OPENDJ-1802 ByteString.valueOf() => valueOfInt(), valueOfLong(), valueOfUtf8(), valueOfBytes(), valueOfObject()
-  
-  
-    org/forgerock/opendj/ldap/Connections
-    7002
-    *newAuthenticatedConnectionFactory*
-    OPENDJ-1607: merge authenticated and heart-beat connection factories into
-      LDAPConnectionFactory. Pre-authenticated connection support is now part of
-      LDAPConnectionFactory and can be enabled by specifying the AUTHN_BIND_REQUEST option.
-  
-  
-    org/forgerock/opendj/ldap/Connections
-    7002
-    *newHeartBeatConnectionFactory*
-    OPENDJ-1607: merge authenticated and heart-beat connection factories into
-      LDAPConnectionFactory. Heart-beat support is now part of
-      LDAPConnectionFactory and can be configured using the HEARTBEAT_* options.
-  
-  
-    org/forgerock/opendj/ldap/AuthenticatedConnectionFactory*
-    8001
-    OPENDJ-1607: merge authenticated and heart-beat connection factories into
-      LDAPConnectionFactory. Pre-authenticated connection support is now part of
-      LDAPConnectionFactory and can be enabled by specifying the AUTHN_BIND_REQUEST option.
-  
-  
-    org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest
-    7012
-    *addEnabled*(java.util.Collection)
-    OPENDJ-1607: added Collection based addEnabled* methods
-  
-  
-    org/forgerock/opendj/ldap/AttributeParser
-    7014
-    java.util.Set asSetOf(org.forgerock.opendj.ldap.Function, java.lang.Object[])
-    Method needs to be final in order to use SafeVarArgs annotation
-  
-  
-    org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm
-    1001
-    Class instances are now created using Connections.newFailoverLoadBalancer
-  
-  
-    org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm
-    1001
-    Class instances are now created using Connections.newRoundRobinLoadBalancer
-  
 
diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml
index 4d3ddac2b..83bd6da10 100644
--- a/opendj-core/pom.xml
+++ b/opendj-core/pom.xml
@@ -21,8 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS
-  !    
+  !      Copyright 2011-2016 ForgeRock AS
 -->
 
     4.0.0
@@ -185,7 +184,7 @@
                                     ${project.groupId}
                                     opendj-ldap-sdk
                                     
-                                    2.6.0
+                                    3.0.0-SNAPSHOT
                                 
                             
                             
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
index 5e7a8059a..dd9f7eac9 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS.
+ *      Portions copyright 2011-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap;
 
@@ -62,7 +62,6 @@
  *      Models 
  */
 public final class DN implements Iterable, Comparable {
-
     static final byte NORMALIZED_RDN_SEPARATOR = 0x00;
     static final byte NORMALIZED_AVA_SEPARATOR = 0x01;
     static final byte NORMALIZED_ESC_BYTE = 0x02;
@@ -78,8 +77,6 @@ public final class DN implements Iterable, Comparable {
 
     private static final ThreadLocal>> CACHE =
             new ThreadLocal>>() {
-
-                /** {@inheritDoc} */
                 @Override
                 protected WeakHashMap> initialValue() {
                     return new WeakHashMap<>();
@@ -283,7 +280,7 @@ private static DN decode(final String dnString, final SubstringReader reader,
 
         RDN rdn;
         try {
-            rdn = RDN.decode(null, reader, schema);
+            rdn = RDN.decode(reader, schema);
         } catch (final UnknownSchemaElementException e) {
             final LocalizableMessage message =
                     ERR_DN_TYPE_NOT_FOUND.get(reader.getString(), e.getMessageObject());
@@ -457,13 +454,11 @@ public DN child(final String attributeType, final Object attributeValue) {
         return child(new RDN(attributeType, attributeValue));
     }
 
-    /** {@inheritDoc} */
     @Override
     public int compareTo(final DN dn) {
         return compareTo(this, dn);
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -476,7 +471,6 @@ public boolean equals(final Object obj) {
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int hashCode() {
         return toNormalizedByteString().hashCode();
@@ -955,7 +949,6 @@ public String toNormalizedUrlSafeString() {
      * @Deprecated This class will eventually be replaced by a compact implementation of a DN.
      */
     public static final class CompactDn implements Comparable {
-
         /** Original string corresponding to the DN. */
         private final byte[] originalValue;
 
@@ -972,7 +965,6 @@ private CompactDn(final DN dn) {
             this.schema = dn.schema;
         }
 
-        /** {@inheritDoc} */
         @Override
         public int compareTo(final CompactDn other) {
             byte[] normValue = getNormalizedValue();
@@ -989,13 +981,11 @@ public DN toDn() {
             return DN.valueOf(ByteString.toString(originalValue, 0, originalValue.length), schema);
         }
 
-        /** {@inheritDoc} */
         @Override
         public int hashCode() {
             return Arrays.hashCode(getNormalizedValue());
         }
 
-        /** {@inheritDoc} */
         @Override
         public boolean equals(Object obj) {
             if (this == obj) {
@@ -1008,7 +998,6 @@ public boolean equals(Object obj) {
             }
         }
 
-        /** {@inheritDoc} */
         @Override
         public String toString() {
             return ByteString.toString(originalValue, 0, originalValue.length);
@@ -1030,5 +1019,4 @@ private byte[] getNormalizedValue() {
     public CompactDn compact() {
         return new CompactDn(this);
     }
-
 }
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java
index b348df661..9960fd84d 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS.
+ *      Portions copyright 2011-2016 ForgeRock AS.
  */
-
 package org.forgerock.opendj.ldap;
 
 import java.util.List;
@@ -73,7 +72,6 @@ final class InternalConnection extends AbstractAsynchronousConnection {
         this.serverConnection = serverConnection;
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise abandonAsync(final AbandonRequest request) {
         final int i = messageID.getAndIncrement();
@@ -81,7 +79,6 @@ public LdapPromise abandonAsync(final AbandonRequest request) {
         return newSuccessfulLdapPromise((Void) null, i);
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise addAsync(final AddRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -92,32 +89,28 @@ public LdapPromise addAsync(final AddRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void addConnectionEventListener(final ConnectionEventListener listener) {
         Reject.ifNull(listener);
         listeners.add(listener);
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise bindAsync(final BindRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
         final int i = messageID.getAndIncrement();
         final BindResultLdapPromiseImpl promise =
-                newBindLdapPromise(i, request, null, intermediateResponseHandler, this);
+                newBindLdapPromise(i, request, null, intermediateResponseHandler);
         serverConnection.handleBind(i, 3, request, promise, promise);
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void close(final UnbindRequest request, final String reason) {
         final int i = messageID.getAndIncrement();
         serverConnection.handleConnectionClosed(i, request);
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise compareAsync(final CompareRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -128,7 +121,6 @@ public LdapPromise compareAsync(final CompareRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise deleteAsync(final DeleteRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -139,7 +131,6 @@ public LdapPromise deleteAsync(final DeleteRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public  LdapPromise extendedRequestAsync(final ExtendedRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -150,21 +141,18 @@ public  LdapPromise extendedRequestAsync(final Exte
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isClosed() {
         // FIXME: this should be true after close has been called.
         return false;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean isValid() {
         // FIXME: this should be false if this connection is disconnected.
         return true;
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise modifyAsync(final ModifyRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -175,7 +163,6 @@ public LdapPromise modifyAsync(final ModifyRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise modifyDNAsync(final ModifyDNRequest request,
             final IntermediateResponseHandler intermediateResponseHandler) {
@@ -186,14 +173,12 @@ public LdapPromise modifyDNAsync(final ModifyDNRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void removeConnectionEventListener(final ConnectionEventListener listener) {
         Reject.ifNull(listener);
         listeners.remove(listener);
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise searchAsync(final SearchRequest request,
             final IntermediateResponseHandler intermediateResponseHandler, final SearchResultHandler entryHandler) {
@@ -204,14 +189,8 @@ public LdapPromise searchAsync(final SearchRequest request,
         return promise;
     }
 
-    /** {@inheritDoc} */
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("InternalConnection(");
-        builder.append(serverConnection);
-        builder.append(')');
-        return builder.toString();
+        return getClass().getSimpleName() + "(" + serverConnection + ')';
     }
-
 }
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
index bf5bfe1e0..b21938f17 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS.
+ *      Portions copyright 2011-2016 ForgeRock AS.
  */
-
 package org.forgerock.opendj.ldap;
 
 import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_TYPE_NOT_FOUND;
@@ -32,11 +31,11 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.TreeSet;
 
-import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.i18n.LocalizedIllegalArgumentException;
 import org.forgerock.opendj.ldap.schema.AttributeType;
 import org.forgerock.opendj.ldap.schema.Schema;
@@ -140,17 +139,14 @@ public static RDN valueOf(final String rdn) {
     public static RDN valueOf(final String rdn, final Schema schema) {
         final SubstringReader reader = new SubstringReader(rdn);
         try {
-            return decode(rdn, reader, schema);
+            return decode(reader, schema);
         } catch (final UnknownSchemaElementException e) {
-            final LocalizableMessage message =
-                    ERR_RDN_TYPE_NOT_FOUND.get(rdn, e.getMessageObject());
-            throw new LocalizedIllegalArgumentException(message);
+            throw new LocalizedIllegalArgumentException(ERR_RDN_TYPE_NOT_FOUND.get(rdn, e.getMessageObject()));
         }
     }
 
-    // FIXME: ensure that the decoded RDN does not contain multiple AVAs
-    // with the same type.
-    static RDN decode(final String rdnString, final SubstringReader reader, final Schema schema) {
+    /** FIXME: ensure that the decoded RDN does not contain multiple AVAs with the same type. */
+    static RDN decode(final SubstringReader reader, final Schema schema) {
         final AVA firstAVA = AVA.decode(reader, schema);
 
         // Skip over any spaces that might be after the attribute value.
@@ -256,7 +252,6 @@ private RDN(final AVA[] avas, final String stringValue) {
         this.stringValue = stringValue;
     }
 
-    /** {@inheritDoc} */
     @Override
     public int compareTo(final RDN rdn) {
         // Identity.
@@ -304,7 +299,6 @@ public int compareTo(final RDN rdn) {
         return 0;
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -343,7 +337,6 @@ public AVA getFirstAVA() {
         return avas[0];
     }
 
-    /** {@inheritDoc} */
     @Override
     public int hashCode() {
         // Avoid an algorithm that requires the AVAs to be sorted.
@@ -478,9 +471,7 @@ StringBuilder toNormalizedUrlSafeString(final StringBuilder builder) {
 
     private Iterator getSortedAvas() {
         TreeSet sortedAvas = new TreeSet<>();
-        for (AVA ava : avas) {
-            sortedAvas.add(ava);
-        }
+        Collections.addAll(sortedAvas, avas);
         return sortedAvas.iterator();
     }
 }
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
index ac2f5ac29..049b9046e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2014 ForgeRock AS
+ *      Portions Copyright 2011-2016 ForgeRock AS
  */
 package org.forgerock.opendj.ldap;
 
@@ -137,9 +137,6 @@ public final class RootDSE {
      * @param connection
      *            A connection to the Directory Server whose Root DSE is to be
      *            read.
-     * @param handler
-     *            A result handler which can be used to asynchronously process
-     *            the operation result when it is received, may be {@code null}.
      * @return A promise representing the result of the operation.
      * @throws UnsupportedOperationException
      *             If the connection does not support search operations.
@@ -149,8 +146,7 @@ public final class RootDSE {
      * @throws NullPointerException
      *             If the {@code connection} was {@code null}.
      */
-    public static LdapPromise readRootDSEAsync(final Connection connection,
-            final LdapResultHandler handler) {
+    public static LdapPromise readRootDSEAsync(final Connection connection) {
         return connection.searchSingleEntryAsync(SEARCH_REQUEST).then(
             new Function() {
                 @Override
@@ -424,19 +420,16 @@ private  Collection getMultiValuedAttribute(
         if (attr != null) {
             return Collections.unmodifiableCollection(Collections2.transformedCollection(attr,
                     function, Functions.objectToByteString()));
-        } else {
-            return Collections.emptySet();
         }
+        return Collections.emptySet();
     }
 
     private  N getSingleValuedAttribute(final AttributeDescription attributeDescription,
         final Function function) {
         final Attribute attr = entry.getAttribute(attributeDescription);
-        if (attr == null || attr.isEmpty()) {
-            return null;
-        } else {
+        if (attr != null && !attr.isEmpty()) {
             return function.apply(attr.firstValue());
         }
+        return null;
     }
-
 }
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
index 3a1ce5694..4bdda4b49 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
@@ -22,9 +22,8 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2015 ForgeRock AS
+ *      Portions copyright 2015-2016 ForgeRock AS
  */
-
 package org.forgerock.opendj.ldap.schema;
 
 import static java.util.Arrays.*;
@@ -52,7 +51,6 @@
  * attribute types that may be used for a given matching rule.
  */
 public final class MatchingRuleUse extends SchemaElement {
-
     /** A fluent API for incrementally constructing matching rule uses. */
     public static final class Builder extends SchemaElementBuilder {
         private String oid;
@@ -245,13 +243,9 @@ public Builder removeName(String name) {
             this.names.remove(name);
             return this;
         }
-
     }
 
-    /**
-     * The OID of the matching rule associated with this matching rule
-     * use definition.
-     */
+    /** The OID of the matching rule associated with this matching rule use definition. */
     private final String oid;
 
     /** The set of user defined names for this definition. */
@@ -260,10 +254,7 @@ public Builder removeName(String name) {
     /** Indicates whether this definition is declared "obsolete". */
     private final boolean isObsolete;
 
-    /**
-     * The set of attribute types with which this matching rule use is
-     * associated.
-     */
+    /** The set of attribute types with which this matching rule use is associated. */
     private final Set attributeOIDs;
 
     private MatchingRule matchingRule;
@@ -471,8 +462,7 @@ void toStringContent(final StringBuilder buffer) {
         }
     }
 
-    void validate(final Schema schema, final List warnings)
-            throws SchemaException {
+    void validate(final Schema schema) throws SchemaException {
         try {
             matchingRule = schema.getMatchingRule(oid);
         } catch (final UnknownSchemaElementException e) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index 592eaf1b1..e3cc54cde 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS
+ *      Portions copyright 2011-2016 ForgeRock AS
  */
 package org.forgerock.opendj.ldap.schema;
 
@@ -589,7 +589,7 @@ void toStringContent(final StringBuilder buffer) {
         }
     }
 
-    void validate(final Schema schema, final List warnings) throws SchemaException {
+    void validate(final Schema schema) throws SchemaException {
         try {
             structuralClass = schema.getObjectClass(structuralClassOID);
         } catch (final UnknownSchemaElementException e) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
index e9593a29d..1dba03afd 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
@@ -23,7 +23,7 @@
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
  *      Portions Copyright 2014 Manuel Gaupp
- *      Portions Copyright 2011-2015 ForgeRock AS
+ *      Portions Copyright 2011-2016 ForgeRock AS
  */
 package org.forgerock.opendj.ldap.schema;
 
@@ -81,9 +81,7 @@
 import com.forgerock.opendj.util.StaticUtils;
 import com.forgerock.opendj.util.SubstringReader;
 
-/**
- * Schema builders should be used for incremental construction of new schemas.
- */
+/** Schema builders should be used for incremental construction of new schemas. */
 public final class SchemaBuilder {
 
     /** Constant used for name to oid mapping when one name actually maps to multiple numerical OID. */
@@ -108,10 +106,7 @@ private static SearchRequest getReadSchemaForEntrySearchRequest(final DN dn) {
                 SUBSCHEMA_SUBENTRY_ATTRS);
     }
 
-    /**
-     * Constructs a search request for retrieving the named subschema
-     * sub-entry.
-     */
+    /** Constructs a search request for retrieving the named subschema sub-entry. */
     private static SearchRequest getReadSchemaSearchRequest(final DN dn) {
         return Requests.newSearchRequest(dn, SearchScope.BASE_OBJECT, SUBSCHEMA_FILTER,
                 SUBSCHEMA_ATTRS);
@@ -160,20 +155,13 @@ private static DN getSubschemaSubentryDN(final DN name, final Entry entry) throw
     private List warnings;
     private Options options;
 
-
     /** A schema which should be copied into this builder on any mutation. */
     private Schema copyOnWriteSchema;
 
-    /**
-     * A unique ID which can be used to uniquely identify schemas
-     * constructed without a name.
-     */
+    /** A unique ID which can be used to uniquely identify schemas constructed without a name. */
     private static final AtomicInteger NEXT_SCHEMA_ID = new AtomicInteger();
 
-    /**
-     * Creates a new schema builder with no schema elements and default
-     * compatibility options.
-     */
+    /** Creates a new schema builder with no schema elements and default compatibility options. */
     public SchemaBuilder() {
         preLazyInitBuilder(null, null);
     }
@@ -870,7 +858,7 @@ public SchemaBuilder addMatchingRuleUse(final String definition, final boolean o
             }
 
             // Make sure that the set of attributes was defined.
-            if (attributes == null || attributes.size() == 0) {
+            if (attributes == null || attributes.isEmpty()) {
                 throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_MRUSE_NO_ATTR.get(definition));
             }
             useBuilder.attributes(attributes);
@@ -2675,7 +2663,7 @@ private void validate(final Schema schema) {
         for (final MatchingRuleUse use : numericOID2MatchingRuleUses.values().toArray(
                 new MatchingRuleUse[numericOID2MatchingRuleUses.values().size()])) {
             try {
-                use.validate(schema, warnings);
+                use.validate(schema);
                 for (final String name : use.getNames()) {
                     registerNameToOIDMapping(StaticUtils.toLowerCase(name), use.getMatchingRuleOID());
                 }
@@ -2688,7 +2676,7 @@ private void validate(final Schema schema) {
         for (final NameForm form : numericOID2NameForms.values().toArray(
                 new NameForm[numericOID2NameForms.values().size()])) {
             try {
-                form.validate(schema, warnings);
+                form.validate(schema);
 
                 // build the objectClass2NameForms map
                 final String ocOID = form.getStructuralClass().getOID();
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java
index ccc456160..ddf09afe5 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014-2015 ForgeRock AS.
+ *      Copyright 2014-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap.spi;
 
@@ -51,9 +51,7 @@
 import org.forgerock.util.promise.PromiseImpl;
 import org.forgerock.util.promise.Promises;
 
-/**
- * Utility methods for creating and composing {@link LdapPromise}s.
- */
+/** Utility methods for creating and composing {@link LdapPromise}s. */
 public final class LdapPromises {
     private LdapPromises() {
     }
@@ -83,44 +81,13 @@ public static  LdapPromise asPromise(Promise wrappedProm
      *         Client that binds to the server.
      * @param intermediateResponseHandler
      *         Handler that consumes intermediate responses from extended operations.
-     * @param connection
-     *         The connection to directory server.
-     * @return The new {@link BindResultLdapPromiseImpl}.
-     */
-    public static BindResultLdapPromiseImpl newBindLdapPromise(
-            final int requestID,
-            final BindRequest request,
-            final BindClient bindClient,
-            final IntermediateResponseHandler intermediateResponseHandler,
-            final Connection connection) {
-        return new BindResultLdapPromiseImpl(LdapPromises.newInnerBindOrStartTLSPromise(),
-                                             requestID,
-                                             request,
-                                             bindClient,
-                                             intermediateResponseHandler);
-    }
-
-    /**
-     * Creates a new bind {@link BindResultLdapPromiseImpl}.
-     *
-     * @param requestID
-     *         Identifier of the request.
-     * @param request
-     *         The bind request sent to server.
-     * @param bindClient
-     *         Client that binds to the server.
-     * @param intermediateResponseHandler
-     *         Handler that consumes intermediate responses from extended operations.
-     * @param connection
-     *         The connection to directory server.
      * @return The new {@link BindResultLdapPromiseImpl}.
      */
     public static BindResultLdapPromiseImpl newBindLdapPromise(
             final int requestID,
             final BindRequest request,
             final BindClient bindClient,
-            final IntermediateResponseHandler intermediateResponseHandler,
-            final LDAPConnectionImpl connection) {
+            final IntermediateResponseHandler intermediateResponseHandler) {
         return new BindResultLdapPromiseImpl(LdapPromises.newInnerBindOrStartTLSPromise(),
                                              requestID,
                                              request,
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
index 71501193d..3e7101ca1 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java
@@ -446,7 +446,7 @@ public Promise answer(final InvocationOnMock
     }
 
     private BindResultLdapPromiseImpl mockBindAsyncResponse() {
-        final BindResultLdapPromiseImpl bindPromise = newBindLdapPromise(-1, null, null, null, ldapConnection);
+        final BindResultLdapPromiseImpl bindPromise = newBindLdapPromise(-1, null, null, null);
         when(ldapConnection.bindAsync(any(BindRequest.class), any(IntermediateResponseHandler.class)))
                 .thenReturn(bindPromise);
         return bindPromise;
diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
index 0c3168926..04cea5183 100644
--- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
+++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2015 ForgeRock AS
+ *      Portions Copyright 2011-2016 ForgeRock AS
  */
 package org.forgerock.opendj.grizzly;
 
@@ -276,7 +276,7 @@ public LdapPromise bindAsync(final BindRequest request,
         }
 
         final BindResultLdapPromiseImpl promise =
-                newBindLdapPromise(messageID, request, context, intermediateResponseHandler, this);
+                newBindLdapPromise(messageID, request, context, intermediateResponseHandler);
 
         try {
             synchronized (stateLock) {
@@ -521,7 +521,6 @@ public void removeConnectionEventListener(final ConnectionEventListener listener
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public LdapPromise searchAsync(final SearchRequest request,
         final IntermediateResponseHandler intermediateResponseHandler, final SearchResultHandler entryHandler) {
@@ -554,13 +553,8 @@ public LdapPromise searchAsync(final SearchRequest request,
 
     @Override
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("LDAPConnection(");
-        builder.append(connection.getLocalAddress());
-        builder.append(',');
-        builder.append(connection.getPeerAddress());
-        builder.append(')');
-        return builder.toString();
+        return getClass().getSimpleName() + "(" + connection.getLocalAddress()
+            + ',' + connection.getPeerAddress() + ')';
     }
 
     @Override
diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroupAsync.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroupAsync.java
index 023341307..d6ba41767 100644
--- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroupAsync.java
+++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/UpdateGroupAsync.java
@@ -20,10 +20,8 @@
  *
  * CDDL HEADER END
  *
- *      Copyright 2015 ForgeRock AS.
- *
+ *      Copyright 2016 ForgeRock AS.
  */
-
 package org.forgerock.opendj.examples;
 
 import static org.forgerock.util.Utils.closeSilently;
@@ -115,7 +113,7 @@ public Promise apply(Connection connection)
                     @Override
                     public Promise apply(BindResult bindResult)
                             throws LdapException {
-                        return RootDSE.readRootDSEAsync(connection, null);
+                        return RootDSE.readRootDSEAsync(connection);
                     }
                 })
                 .thenAsync(new AsyncFunction() {
@@ -191,9 +189,7 @@ public void handleException(LdapException e) {
         System.exit(resultCode);
     }
 
-    /**
-     * Print usage then exit.
-     */
+    /** Print usage then exit. */
     private static void printUsage() {
         System.err.println("Usage: host port group-dn member-dn {add|del}");
         System.err.println("For example: localhost 1389 "
@@ -224,9 +220,7 @@ private static void log(final String message) {
         System.out.println(message);
     }
 
-    /**
-     * Constructor not used.
-     */
+    /** Constructor not used. */
     private UpdateGroupAsync() {
         // Not used.
     }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index b21b35455..5cb887ec5 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -21,9 +21,8 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014-2015 ForgeRock AS.
+ *      Copyright 2014-2016 ForgeRock AS.
  */
-
 package com.forgerock.opendj.ldap.tools;
 
 import static java.util.Locale.ENGLISH;
@@ -83,7 +82,6 @@ private AddRateExecutionEndedException() {
     }
 
     private final class AddPerformanceRunner extends PerformanceRunner {
-
         private final class AddStatsHandler extends UpdateStatsResultHandler {
             private final String entryDN;
 
@@ -169,7 +167,7 @@ public Promise performOperation(
                 startPurgeIfMaxNumberAddReached();
                 startToggleDeleteIfAgeThresholdReached(currentTime);
                 try {
-                    String entryToRemove = getEntryToRemove(currentTime);
+                    String entryToRemove = getEntryToRemove();
                     if (entryToRemove != null) {
                         return doDelete(connection, currentTime, entryToRemove);
                     }
@@ -203,15 +201,12 @@ private void startPurgeIfMaxNumberAddReached() {
             // FIXME Followings @Checkstyle:ignore tags are related to the maven-checkstyle-plugin
             // issue related here: https://github.com/checkstyle/checkstyle/issues/5
             // @Checkstyle:ignore
-            private String getEntryToRemove(final long currentTime) throws AddRateExecutionEndedException {
+            private String getEntryToRemove() throws AddRateExecutionEndedException {
                 if (isPurgeBranchRunning.get()) {
                     return purgeEntry();
-                }
-
-                if (toggleDelete && entryCount.get() > sizeThreshold) {
+                } else if (toggleDelete && entryCount.get() > sizeThreshold) {
                     return removeFirstAddedEntry();
                 }
-
                 return null;
             }
 
@@ -538,6 +533,5 @@ private void addCommonArguments(final ArgumentParser argParser) throws ArgumentE
             new BooleanArgument("scriptFriendly", 'S', "scriptFriendly", INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
         scriptFriendly.setPropertyName("scriptFriendly");
         argParser.addArgument(scriptFriendly);
-
     }
 }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
index f062e0b08..b98fc1976 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2015 ForgeRock AS.
+ *      Portions Copyright 2011-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.ldap.tools;
 
@@ -192,7 +192,7 @@ public boolean handleReference(final SearchResultReference reference) {
      */
 
     public static void main(final String[] args) {
-        final int retCode = new LDAPSearch().run(args, false);
+        final int retCode = new LDAPSearch().run(args);
         System.exit(filterExitCode(retCode));
     }
 
@@ -225,7 +225,7 @@ public boolean isVerbose() {
     }
 
     /** Run ldapsearch with provided command-line arguments. */
-    int run(final String[] args, final boolean returnMatchingEntries) {
+    int run(final String[] args) {
         // Create the command-line argument parser for use with this program.
         final LocalizableMessage toolDescription = INFO_LDAPSEARCH_TOOL_DESCRIPTION.get();
         final ArgumentParser argParser =
@@ -471,18 +471,14 @@ int run(final String[] args, final boolean returnMatchingEntries) {
 
         if (filename.isPresent()) {
             // Read the filter strings.
-            BufferedReader in = null;
-            try {
-                in = new BufferedReader(new FileReader(filename.getValue()));
+            try (BufferedReader in = new BufferedReader(new FileReader(filename.getValue()))) {
                 String line = null;
-
                 while ((line = in.readLine()) != null) {
                     if ("".equals(line.trim())) {
                         // ignore empty lines.
                         continue;
                     }
-                    final Filter ldapFilter = Filter.valueOf(line);
-                    filters.add(ldapFilter);
+                    filters.add(Filter.valueOf(line));
                 }
             } catch (final LocalizedIllegalArgumentException e) {
                 errPrintln(e.getMessageObject());
@@ -490,14 +486,6 @@ int run(final String[] args, final boolean returnMatchingEntries) {
             } catch (final IOException e) {
                 errPrintln(LocalizableMessage.raw(e.toString()));
                 return ResultCode.CLIENT_SIDE_FILTER_ERROR.intValue();
-            } finally {
-                if (in != null) {
-                    try {
-                        in.close();
-                    } catch (final IOException ioe) {
-                        // Ignored.
-                    }
-                }
             }
         }
 
@@ -783,9 +771,7 @@ int run(final String[] args, final boolean returnMatchingEntries) {
             return 0;
         }
 
-        Connection connection = null;
-        try {
-            connection = connectionFactory.getConnection();
+        try (Connection connection = connectionFactory.getConnection()) {
             if (bindRequest != null) {
                 printPasswordPolicyResults(this, connection.bind(bindRequest));
             }
@@ -874,12 +860,11 @@ int run(final String[] args, final boolean returnMatchingEntries) {
                 println(INFO_LDAPSEARCH_MATCHING_ENTRY_COUNT.get(resultHandler.entryCount));
                 println();
             }
+            return 0;
         } catch (final LdapException ere) {
             return printErrorMessage(this, ere);
         } finally {
-            closeSilently(ldifWriter, connection);
+            closeSilently(ldifWriter);
         }
-
-        return 0;
     }
 }
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java
index 2fa67a9aa..6b489d82f 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2014 ForgeRock AS.
+ *      Copyright 2014-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.ldap.tools;
 
@@ -30,7 +30,6 @@
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.ERR_TOOL_RESULT_CODE;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.INFO_LDAPSEARCH_MATCHING_ENTRY_COUNT;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.INFO_LDAPSEARCH_TOOL_DESCRIPTION;
-import static org.forgerock.util.Utils.closeSilently;
 
 import java.io.PrintStream;
 import java.util.Random;
@@ -42,9 +41,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-/**
- * Simple integration tests to check the ldapsearch command.
- */
+/** Simple integration tests to check the ldapsearch command. */
 @SuppressWarnings("javadoc")
 public class LDAPSearchITCase extends ToolsITCase {
     private static final int NB_RAND_SIMPLE_SEARCH = 10;
@@ -90,16 +87,11 @@ public void testITLDAPSearch(String[] arguments, Object expectedOut, Object expe
         ByteStringBuilder out = new ByteStringBuilder();
         ByteStringBuilder err = new ByteStringBuilder();
 
-        PrintStream outStream = new PrintStream(out.asOutputStream());
-        PrintStream errStream = new PrintStream(err.asOutputStream());
-        try {
+        try (PrintStream outStream = new PrintStream(out.asOutputStream());
+            PrintStream errStream = new PrintStream(err.asOutputStream())) {
             LDAPSearch ldapSearch = new LDAPSearch(outStream, errStream);
-
-            ldapSearch.run(arguments, false);
+            ldapSearch.run(arguments);
             checkOuputStreams(out, err, expectedOut, expectedErr);
-        } finally {
-            closeSilently(outStream, errStream);
         }
     }
-
 }

From c00834c47d3c9014028fca589cb6bc4d9e320cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Thu, 7 Jan 2016 15:01:46 +0100
Subject: [PATCH 019/125] Utils.closeSilently() => try-with-resources

---
 .../maven/UpdateCopyrightTestCase.java        | 16 +++-------------
 .../maven/doc/GenerateMessageFileMojo.java    |  6 +-----
 .../forgerock/opendj/ldap/tools/LDIFDiff.java | 15 ++++++---------
 .../opendj/ldap/tools/LDIFSearch.java         | 19 ++++++-------------
 .../opendj/ldap/tools/AddRateITCase.java      |  3 ++-
 .../opendj/ldap/tools/AuthRateITCase.java     | 13 ++++---------
 .../opendj/ldap/tools/LDAPCompareITCase.java  | 12 ++++--------
 7 files changed, 26 insertions(+), 58 deletions(-)

diff --git a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
index 8d6b6910f..bfff6bc88 100644
--- a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
+++ b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Copyright 2015 ForgeRock AS.
+ *      Copyright 2015-2016 ForgeRock AS.
  */
 package org.forgerock.maven;
 
@@ -36,7 +36,6 @@
 import java.util.List;
 
 import org.forgerock.testng.ForgeRockTestCase;
-import org.forgerock.util.Utils;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -133,9 +132,7 @@ public void testUpdateCopyright(String testCaseFolderPath, String lineBeforeCopy
     }
 
     private void checkMofidiedFile(String filePath) throws Exception {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(filePath));
+        try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
             String mustBeRemoved = null;
             String expectedOutput = null;
             String currentLine;
@@ -148,8 +145,6 @@ private void checkMofidiedFile(String filePath) throws Exception {
                 }
             }
             checkIfNewFileIsValid(mustBeRemoved, expectedOutput, filePath + ".tmp");
-        } finally {
-            Utils.closeSilently(reader);
         }
     }
 
@@ -159,10 +154,7 @@ private void checkIfNewFileIsValid(String mustBeRemoved, String expectedOutput,
             return;
         }
 
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new FileReader(filePath));
-
+        try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
             boolean expectedOutputFound = false;
             String currentLine;
             while ((currentLine = reader.readLine()) != null) {
@@ -180,8 +172,6 @@ private void checkIfNewFileIsValid(String mustBeRemoved, String expectedOutput,
             if (!expectedOutputFound) {
                 throw new Exception("Generated file " + filePath + " should contains " + expectedOutput);
             }
-        } finally {
-            Utils.closeSilently(reader);
         }
     }
 
diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
index 2b014f9bf..553316324 100644
--- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
+++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java
@@ -157,12 +157,8 @@ private void writeLogRef(final File file, final String template, final Map
Date: Fri, 8 Jan 2016 15:19:38 +0100
Subject: [PATCH 020/125] ForgeRock BOM 4.1.1 Migration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a0c1fa545..492f48974 100644
--- a/pom.xml
+++ b/pom.xml
@@ -162,7 +162,7 @@
             
                 org.forgerock.commons
                 forgerock-bom
-                4.1.0
+                4.1.1
                 import
                 pom
             

From 7c110a083b975d772ff6df00bc215989a858addb Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Fri, 8 Jan 2016 12:22:03 +0100
Subject: [PATCH 021/125] OPENDJ-2340 Update third party readme file

* Update THIRDPARTYREADME file according to the BOM 4.1.1
* Update copyright year when it was needed
---
 opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt b/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
index 9865ba266..d89259fc1 100644
--- a/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
+++ b/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
@@ -4,7 +4,7 @@ DO NOT TRANSLATE OR LOCALIZE
 COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
 ***************************************************************************
 
-Version: forgerock-util.jar (3.0.1)
+Version: forgerock-util.jar (3.0.2)
 Copyright: Copyright 2011-2015 ForgeRock AS.
            Copyright (c) 2010-2011 ApexIdentity Inc. All rights reserved.
            Portions Copyright 2011-2015 ForgeRock AS.
@@ -38,7 +38,7 @@ Copyright: Copyright 2013-2015 ForgeRock AS.
            Portions Copyright 2011-2015 ForgeRock AS.
 
 Version: opendj-ldap-toolkit.jar (3.0.0)
-Copyright: Copyright 2011-2015 ForgeRock AS.
+Copyright: Copyright 2011-2016 ForgeRock AS.
            Copyright 2006-2010 Sun Microsystems, Inc.
            Portions Copyright 2011-2015 ForgeRock AS.
 ==================

From c218e91c16b2aa7002cf41f29567ebec7f441052 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Fri, 8 Jan 2016 16:49:26 +0100
Subject: [PATCH 022/125] Improve copyright maven plugin

Copyright plugin now supports .properties files.
Thanks to JNR for the RFE.
---
 .../main/java/org/forgerock/maven/CopyrightAbstractMojo.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index 3a2a6ead6..2ec0d4d49 100644
--- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -101,7 +101,7 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo {
 
     /** The file extensions to test. */
     public static final List CHECKED_EXTENSIONS = new LinkedList<>(Arrays.asList(
-            "bat", "c", "h", "html", "java", "ldif", "Makefile", "mc", "sh", "txt", "xml", "xsd", "xsl"));
+            "bat", "c", "h", "html", "java", "ldif", "Makefile", "mc", "properties", "sh", "txt", "xml", "xsd", "xsl"));
 
     private static final List EXCLUDED_END_COMMENT_BLOCK_TOKEN = new LinkedList<>(Arrays.asList(
                     "*/", "-->"));

From 3e8bfca9edd0b76a97e8be586a4c744d4d96ef02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Fri, 8 Jan 2016 17:24:51 +0100
Subject: [PATCH 023/125] Code cleanup

Removes useless code in copyright maven plugin.
---
 .../forgerock/maven/CopyrightAbstractMojo.java  | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index 2ec0d4d49..b368ab7a5 100644
--- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -100,17 +100,12 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo {
     private List disabledFiles;
 
     /** The file extensions to test. */
-    public static final List CHECKED_EXTENSIONS = new LinkedList<>(Arrays.asList(
-            "bat", "c", "h", "html", "java", "ldif", "Makefile", "mc", "properties", "sh", "txt", "xml", "xsd", "xsl"));
+    public static final List CHECKED_EXTENSIONS = Arrays.asList(
+            "bat", "c", "h", "html", "java", "ldif", "Makefile", "mc", "properties", "sh", "txt", "xml", "xsd", "xsl");
 
-    private static final List EXCLUDED_END_COMMENT_BLOCK_TOKEN = new LinkedList<>(Arrays.asList(
-                    "*/", "-->"));
-
-    private static final List SUPPORTED_COMMENT_MIDDLE_BLOCK_TOKEN = new LinkedList<>(Arrays.asList(
-                    "*", "#", "rem", "!"));
-
-    private static final List SUPPORTED_START_BLOCK_COMMENT_TOKEN = new LinkedList<>(Arrays.asList(
-                    "/*", "");
+    private static final List SUPPORTED_COMMENT_MIDDLE_BLOCK_TOKEN = Arrays.asList("*", "#", "rem", "!");
+    private static final List SUPPORTED_START_BLOCK_COMMENT_TOKEN = Arrays.asList("/*", "
-                        
-                            README
-                            **/README
-                            README.txt
-                            **/README.txt
-                            **/THIRDPARTYREADME.txt
-                            legal-notices/CDDLv1_0.txt
-                            **/tests/unit-tests-testng/resource/config-changes.ldif
-                        
-                    
-                
-
                 
                     org.forgerock.opendj
                     opendj-doc-maven-plugin
diff --git a/pom.xml b/pom.xml
index 492f48974..1e0e619d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,30 @@
         
     
 
+    
+        
+            
+                
+                    org.forgerock.opendj
+                    opendj-copyright-maven-plugin
+                    ${project.version}
+                    
+                        
+                        
+                            README
+                            **/README
+                            README.txt
+                            **/README.txt
+                            **/THIRDPARTYREADME.txt
+                            legal-notices/CDDLv1_0.txt
+                            **/tests/unit-tests-testng/resource/config-changes.ldif
+                        
+                    
+                
+            
+        
+    
+
     
         
             

From db6e17cbfcfab6064e9446bacc49d452a691ff24 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Tue, 12 Jan 2016 11:28:10 +0100
Subject: [PATCH 029/125] Improve copyright maven plugin

Creates a property name to allow user to set the reference git branch to
use in the diff command.
Also log a quick message to explain how to use the property.
Extracs some constants to mutualize the code.
---
 .../main/java/org/forgerock/maven/CheckCopyrightMojo.java  | 7 +++++--
 .../java/org/forgerock/maven/CopyrightAbstractMojo.java    | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java
index d93d69634..80c6d31da 100644
--- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java
+++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java
@@ -38,12 +38,13 @@
  */
 @Mojo(name = "check-copyright", defaultPhase = LifecyclePhase.VALIDATE)
 public class CheckCopyrightMojo extends CopyrightAbstractMojo {
+    private static final String IGNORE_COPYRIGHT_ERRORS_PROPERTY = "ignoreCopyrightErrors";
 
     /**
      * The property that may be used to prevent copyright date problems from
      * failing the build.
      */
-    @Parameter(required = true, property = "ignoreCopyrightErrors", defaultValue = "false")
+    @Parameter(required = true, property = IGNORE_COPYRIGHT_ERRORS_PROPERTY, defaultValue = "false")
     private boolean ignoreCopyrightErrors;
 
     @Parameter(required = true, property = "skipCopyrightCheck", defaultValue = "false")
@@ -74,9 +75,11 @@ public void execute() throws MojoFailureException, MojoExecutionException {
 
             if (!ignoreCopyrightErrors) {
                 getLog().warn("Fix copyright date problems before proceeding, "
-                                + "or use '-DignoreCopyrightErrors=true' to ignore copyright errors.");
+                        + "or use '-D" + IGNORE_COPYRIGHT_ERRORS_PROPERTY + "=true' to ignore copyright errors.");
                 getLog().warn("You can use update-copyrights maven profile "
                         + "(mvn validate -Pupdate-copyrights) to automatically update copyrights.");
+                getLog().warn("Use '-D" + DIFF_REFERENCE_BRANCH_NAME_PROPERTY + "=branchname' to change the reference "
+                        + "branch which is used against your active local branch to check committed changes.");
                 throw new MojoExecutionException("Found files with potential copyright year updates needed");
             }
         } else {
diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
index b368ab7a5..91418b73a 100644
--- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
+++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java
@@ -69,6 +69,7 @@
  * Abstract class which is used for both copyright checks and updates.
  */
 public abstract class CopyrightAbstractMojo extends AbstractMojo {
+    static final String DIFF_REFERENCE_BRANCH_NAME_PROPERTY = "checkCopyrightDiffReferenceBranchName";
 
     /** The Maven Project. */
     @Parameter(required = true, property = "project", readonly = true)
@@ -89,7 +90,7 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo {
     private String scmRepositoryUrl;
 
     /** The Git master branch name of the repository. **/
-    @Parameter(required = true, defaultValue = "origin/master")
+    @Parameter(required = true, property = DIFF_REFERENCE_BRANCH_NAME_PROPERTY, defaultValue = "origin/master")
     private String gitMasterBranchName;
 
     /**

From 0034c9206e12f128482c622075c2b133c98ebfc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Fri, 8 Jan 2016 14:32:04 +0100
Subject: [PATCH 030/125] OPENDJ-1019 modrate/searchrate should validate bind
 parameters before launching perf test

For all *rate tools, abort the run if the tool cannot connect to the server (wrong bind options, server unreachable, etc.)

PerformanceRunner.java:
Added validateCanConnectToServer()
---
 .../opendj/ldap/tools/PerformanceRunner.java       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index 6d7c17b08..c857085a6 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2015 ForgeRock AS.
+ *      Portions Copyright 2011-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.ldap.tools;
 
@@ -882,12 +882,14 @@ TimerThread newEndTimerThread(final long timeTowait) {
     final int run(final ConnectionFactory connectionFactory) {
         final List connections = new ArrayList<>();
 
-        Connection connection = null;
         try {
+            validateCanConnectToServer(connectionFactory);
+
             isWarmingUp = warmUpDuration > 0;
             for (int i = 0; i < numConnections; i++) {
+                Connection connection = null;
                 if (keepConnectionsOpen.isPresent() || noRebindArgument.isPresent()) {
-                    connection = connectionFactory.getConnectionAsync().getOrThrow();
+                    connection = connectionFactory.getConnection();
                     connection.addConnectionEventListener(this);
                     connections.add(connection);
                 }
@@ -930,6 +932,12 @@ final int run(final ConnectionFactory connectionFactory) {
         return 0;
     }
 
+    private void validateCanConnectToServer(ConnectionFactory connectionFactory) throws LdapException {
+        try (Connection c = connectionFactory.getConnection()) {
+            // detects wrong bind parameters, server unreachable (server down, network problem?), etc.
+        }
+    }
+
     void setBindRequest(final BindRequest request) {
         this.bindRequest = request;
     }

From 6ff7e60ec0a010303c104b87950560b3ba7e6f87 Mon Sep 17 00:00:00 2001
From: Mark Craig 
Date: Wed, 13 Jan 2016 11:32:17 +0100
Subject: [PATCH 031/125] OPENDJ-2587 Fix links on community project site

---
 src/site/site.xml      |  7 ++++---
 src/site/xdoc/docs.xml | 33 ++++++++++++++++++++++++++++++---
 src/site/xdoc/news.xml |  6 +++---
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 3c2c291d3..73e86998c 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS.
+  !      Copyright 2011-2016 ForgeRock AS.
   !
 -->
 
 
   
-    
-    
+   
+   
+   
   
 
   
diff --git a/src/site/xdoc/docs.xml b/src/site/xdoc/docs.xml
index d89d39887..9d19550f6 100644
--- a/src/site/xdoc/docs.xml
+++ b/src/site/xdoc/docs.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS.
+  !      Copyright 2011-2016 ForgeRock AS.
   !
 -->
 This core documentation is in progress as part of
    the OpenDJ project.

    
For completed, released documentation, see docs.forgerock.org.

+    href="https://backstage.forgerock.com/#!/docs/opendj"
+   >ForgeRock BackStage.

    

     
Release Notes

     

@@ -92,5 +92,32 @@
     
HTML

    

   
+
+  

+   

+    A snapshot of the OpenDJ LDAP Toolkit 3 documentation
+    is available for reference.
+    This documentation corresponds to the 3.0.0 Maven release,
+    which is available through the ForgeRock Maven repository.
+   

+
+   

+    This documentation has been through the initial part of the review cycle,
+    but has not been through validation (QA) review.
+   

+
+   

+    
Release Notes

+    
HTML (with link to PDF inside)

+
+    
SDK Developer Guide, with Tools Reference

+    
HTML (with link to PDF inside)

+
+    
Javadoc

+    
HTML

+   

+  

  
 
diff --git a/src/site/xdoc/news.xml b/src/site/xdoc/news.xml
index e7e15f137..b4a497848 100644
--- a/src/site/xdoc/news.xml
+++ b/src/site/xdoc/news.xml
@@ -21,7 +21,7 @@
   !
   ! CDDL HEADER END
   !
-  !      Copyright 2011-2015 ForgeRock AS.
+  !      Copyright 2011-2016 ForgeRock AS.
   !
 -->
 July 04, 2013. OpenDJ 2.6.0 is now available! OpenDJ 2.6.0 is an important
    release of ForgeRock's directory services product, with many key fixes and
    new features. See the Release
+   href="https://backstage.forgerock.com/#!/docs/opendj/2.6.0/release-notes">Release
    Notes for more. You can get the binaries from the ForgeRock OpenDJ download page.

   
@@ -57,7 +57,7 @@
    OpenDJ passwords, 30 additional new features and enhancements, and 150 bug
    fixes. Get OpenDJ 2.5.0 Xpress from the ForgeRock
    download page. Be sure to
-   read the Release Notes for additional information.

 
    
February 27, 2012. OpenDJ 2.4.5 is now available. OpenDJ 2.4.5 is an

From 00818bf6365195eaae6ecebbe3dd91cac791886c Mon Sep 17 00:00:00 2001
From: "ian.packer" 
Date: Fri, 15 Jan 2016 11:00:57 +0000
Subject: [PATCH 032/125] OPENDJSDK-80 Decode base64 specified control values
 when parsing command line arguments

Add missing base64 decoding to match the documented behaviour/syntax
---
 .../src/main/java/com/forgerock/opendj/ldap/tools/Utils.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
index 7467ccca1..33c8c0063 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/Utils.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2014-2015 ForgeRock AS
+ *      Portions copyright 2014-2016 ForgeRock AS
  */
 package com.forgerock.opendj.ldap.tools;
 
@@ -141,7 +141,7 @@ static GenericControl getControl(final String argString) throws DecodeException
 
         final String valString = remainder.substring(idx + 1, remainder.length());
         if (valString.charAt(0) == ':') {
-            controlValue = ByteString.valueOfUtf8(valString.substring(1, valString.length()));
+            controlValue = ByteString.valueOfBase64(valString.substring(1, valString.length()));
         } else if (valString.charAt(0) == '<') {
             // Read data from the file.
             final String filePath = valString.substring(1, valString.length());

From 6317dc755e688369ada5632723c05a6968bb507c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Tue, 26 Jan 2016 10:56:10 +0100
Subject: [PATCH 033/125] SchemaBuilder.java: In remove*() methods, renamed
 parameter from name to nameOrOid where applicable.

---
 .../opendj/ldap/schema/SchemaBuilder.java     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
index f8d5f88e8..bb27db7ac 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
@@ -1881,19 +1881,19 @@ Options getOptions() {
     /**
      * Removes the named attribute type from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the attribute type to be removed.
      * @return {@code true} if the attribute type was found.
      */
-    public boolean removeAttributeType(final String name) {
+    public boolean removeAttributeType(final String nameOrOid) {
         lazyInitBuilder();
 
-        final AttributeType element = numericOID2AttributeTypes.get(name);
+        final AttributeType element = numericOID2AttributeTypes.get(nameOrOid);
         if (element != null) {
             removeAttributeType(element);
             return true;
         }
-        final List elements = name2AttributeTypes.get(toLowerCase(name));
+        final List elements = name2AttributeTypes.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final AttributeType e : elements) {
                 removeAttributeType(e);
@@ -1906,19 +1906,19 @@ public boolean removeAttributeType(final String name) {
     /**
      * Removes the named DIT content rule from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the DIT content rule to be removed.
      * @return {@code true} if the DIT content rule was found.
      */
-    public boolean removeDITContentRule(final String name) {
+    public boolean removeDITContentRule(final String nameOrOid) {
         lazyInitBuilder();
 
-        final DITContentRule element = numericOID2ContentRules.get(name);
+        final DITContentRule element = numericOID2ContentRules.get(nameOrOid);
         if (element != null) {
             removeDITContentRule(element);
             return true;
         }
-        final List elements = name2ContentRules.get(toLowerCase(name));
+        final List elements = name2ContentRules.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final DITContentRule e : elements) {
                 removeDITContentRule(e);
@@ -1949,19 +1949,19 @@ public boolean removeDITStructureRule(final int ruleID) {
     /**
      * Removes the named matching rule from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the matching rule to be removed.
      * @return {@code true} if the matching rule was found.
      */
-    public boolean removeMatchingRule(final String name) {
+    public boolean removeMatchingRule(final String nameOrOid) {
         lazyInitBuilder();
 
-        final MatchingRule element = numericOID2MatchingRules.get(name);
+        final MatchingRule element = numericOID2MatchingRules.get(nameOrOid);
         if (element != null) {
             removeMatchingRule(element);
             return true;
         }
-        final List elements = name2MatchingRules.get(toLowerCase(name));
+        final List elements = name2MatchingRules.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final MatchingRule e : elements) {
                 removeMatchingRule(e);
@@ -1974,19 +1974,19 @@ public boolean removeMatchingRule(final String name) {
     /**
      * Removes the named matching rule use from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the matching rule use to be removed.
      * @return {@code true} if the matching rule use was found.
      */
-    public boolean removeMatchingRuleUse(final String name) {
+    public boolean removeMatchingRuleUse(final String nameOrOid) {
         lazyInitBuilder();
 
-        final MatchingRuleUse element = numericOID2MatchingRuleUses.get(name);
+        final MatchingRuleUse element = numericOID2MatchingRuleUses.get(nameOrOid);
         if (element != null) {
             removeMatchingRuleUse(element);
             return true;
         }
-        final List elements = name2MatchingRuleUses.get(toLowerCase(name));
+        final List elements = name2MatchingRuleUses.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final MatchingRuleUse e : elements) {
                 removeMatchingRuleUse(e);
@@ -1999,19 +1999,19 @@ public boolean removeMatchingRuleUse(final String name) {
     /**
      * Removes the named name form from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the name form to be removed.
      * @return {@code true} if the name form was found.
      */
-    public boolean removeNameForm(final String name) {
+    public boolean removeNameForm(final String nameOrOid) {
         lazyInitBuilder();
 
-        final NameForm element = numericOID2NameForms.get(name);
+        final NameForm element = numericOID2NameForms.get(nameOrOid);
         if (element != null) {
             removeNameForm(element);
             return true;
         }
-        final List elements = name2NameForms.get(toLowerCase(name));
+        final List elements = name2NameForms.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final NameForm e : elements) {
                 removeNameForm(e);
@@ -2024,19 +2024,19 @@ public boolean removeNameForm(final String name) {
     /**
      * Removes the named object class from this schema builder.
      *
-     * @param name
+     * @param nameOrOid
      *            The name or OID of the object class to be removed.
      * @return {@code true} if the object class was found.
      */
-    public boolean removeObjectClass(final String name) {
+    public boolean removeObjectClass(final String nameOrOid) {
         lazyInitBuilder();
 
-        final ObjectClass element = numericOID2ObjectClasses.get(name);
+        final ObjectClass element = numericOID2ObjectClasses.get(nameOrOid);
         if (element != null) {
             removeObjectClass(element);
             return true;
         }
-        final List elements = name2ObjectClasses.get(toLowerCase(name));
+        final List elements = name2ObjectClasses.get(toLowerCase(nameOrOid));
         if (elements != null) {
             for (final ObjectClass e : elements) {
                 removeObjectClass(e);

From f2965cbff4c71d373e14e60af7906c3af97142c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Fri, 29 Jan 2016 08:42:35 +0100
Subject: [PATCH 034/125] AttributeDescription.java: Added
 create(AttributeType, Collection options), needed by OpenDJ server.

---
 .../opendj/ldap/AttributeDescription.java     | 36 +++++++++++++------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
index 595513ad8..77396b1b7 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
@@ -27,6 +27,7 @@
 package org.forgerock.opendj.ldap;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -587,8 +588,22 @@ public static AttributeDescription create(final AttributeType attributeType, fin
     }
 
     /**
-     * Creates an attribute description having the provided attribute type and
-     * options.
+     * Creates an attribute description having the provided attribute type and options.
+     *
+     * @param attributeType
+     *            The attribute type.
+     * @param options
+     *            The attribute options.
+     * @return The attribute description.
+     * @throws NullPointerException
+     *             If {@code attributeType} or {@code options} was {@code null}.
+     */
+    public static AttributeDescription create(final AttributeType attributeType, final String... options) {
+        return create(attributeType, Arrays.asList(options));
+    }
+
+    /**
+     * Creates an attribute description having the provided attribute type and options.
      *
      * @param attributeType
      *            The attribute type.
@@ -598,23 +613,23 @@ public static AttributeDescription create(final AttributeType attributeType, fin
      * @throws NullPointerException
      *             If {@code attributeType} or {@code options} was {@code null}.
      */
-    public static AttributeDescription create(final AttributeType attributeType,
-            final String... options) {
+    public static AttributeDescription create(final AttributeType attributeType, final Collection options) {
         Reject.ifNull(attributeType);
         Reject.ifNull(options);
 
-        switch (options.length) {
+        switch (options.size()) {
         case 0:
             return create(attributeType);
         case 1:
-            return create(attributeType, options[0]);
+            return create(attributeType, options.iterator().next());
         default:
-            final String[] optionsList = new String[options.length];
-            final String[] normalizedOptions = new String[options.length];
+            final String[] optionsList = new String[options.size()];
+            final String[] normalizedOptions = new String[options.size()];
 
+            final Iterator it = options.iterator();
             final String oid = attributeType.getNameOrOID();
             final StringBuilder builder =
-                    new StringBuilder(oid.length() + options[0].length() + options[1].length() + 2);
+                    new StringBuilder(oid.length() + it.next().length() + it.next().length() + 2);
             builder.append(oid);
 
             int i = 0;
@@ -622,8 +637,7 @@ public static AttributeDescription create(final AttributeType attributeType,
                 builder.append(';');
                 builder.append(option);
                 optionsList[i] = option;
-                final String normalizedOption = toLowerCase(option);
-                normalizedOptions[i++] = normalizedOption;
+                normalizedOptions[i++] = toLowerCase(option);
             }
             Arrays.sort(normalizedOptions);
 

From 0f30b3a301999ad5687f9a121e5bfc95801580ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Fri, 29 Jan 2016 10:07:30 +0100
Subject: [PATCH 035/125] AttributeDescription.java: handled null options in
 create(AttributeType, Collection options)

---
 .../opendj/ldap/AttributeDescription.java        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
index 77396b1b7..b1beb4f48 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java
@@ -28,6 +28,7 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
@@ -599,6 +600,7 @@ public static AttributeDescription create(final AttributeType attributeType, fin
      *             If {@code attributeType} or {@code options} was {@code null}.
      */
     public static AttributeDescription create(final AttributeType attributeType, final String... options) {
+        Reject.ifNull(options);
         return create(attributeType, Arrays.asList(options));
     }
 
@@ -615,25 +617,25 @@ public static AttributeDescription create(final AttributeType attributeType, fin
      */
     public static AttributeDescription create(final AttributeType attributeType, final Collection options) {
         Reject.ifNull(attributeType);
-        Reject.ifNull(options);
 
-        switch (options.size()) {
+        final Collection opts = options != null ? options : Collections. emptySet();
+        switch (opts.size()) {
         case 0:
             return create(attributeType);
         case 1:
-            return create(attributeType, options.iterator().next());
+            return create(attributeType, opts.iterator().next());
         default:
-            final String[] optionsList = new String[options.size()];
-            final String[] normalizedOptions = new String[options.size()];
+            final String[] optionsList = new String[opts.size()];
+            final String[] normalizedOptions = new String[opts.size()];
 
-            final Iterator it = options.iterator();
+            final Iterator it = opts.iterator();
             final String oid = attributeType.getNameOrOID();
             final StringBuilder builder =
                     new StringBuilder(oid.length() + it.next().length() + it.next().length() + 2);
             builder.append(oid);
 
             int i = 0;
-            for (final String option : options) {
+            for (final String option : opts) {
                 builder.append(';');
                 builder.append(option);
                 optionsList[i] = option;

From 19d0109880b36b4d939c0e660b2c090a02c52c45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Tue, 2 Feb 2016 09:10:37 +0100
Subject: [PATCH 036/125] Code cleanup

---
 .../ldap/schema/SchemaBuilderTestCase.java    | 225 +++++++-----------
 1 file changed, 91 insertions(+), 134 deletions(-)

diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
index 3f7c8b7f4..a8e00f85a 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
@@ -51,9 +51,7 @@
 import org.forgerock.opendj.ldap.responses.SearchResultEntry;
 import org.testng.annotations.Test;
 
-/**
- * Test SchemaBuilder.
- */
+/** Test SchemaBuilder. */
 @SuppressWarnings("javadoc")
 public class SchemaBuilderTestCase extends AbstractSchemaTestCase {
 
@@ -62,7 +60,7 @@ public class SchemaBuilderTestCase extends AbstractSchemaTestCase {
      * attribute types regardless of the order in which they were added.
      */
     @Test
-    public void testAttributeTypeDependenciesChildThenParent() {
+    public void attributeTypeDependenciesChildThenParent() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                         .addAttributeType("( childtype-oid NAME 'childtype' SUP parenttype )",
@@ -80,7 +78,7 @@ public void testAttributeTypeDependenciesChildThenParent() {
      * attribute types regardless of the order in which they were added.
      */
     @Test
-    public void testAttributeTypeDependenciesParentThenChild() {
+    public void attributeTypeDependenciesParentThenChild() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                         .addAttributeType(
@@ -93,11 +91,9 @@ public void testAttributeTypeDependenciesParentThenChild() {
                 "1.3.6.1.4.1.1466.115.121.1.15");
     }
 
-    /**
-     * Tests that attribute types must have a syntax or a superior.
-     */
+    /** Tests that attribute types must have a syntax or a superior. */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public void testAttributeTypeNoSuperiorNoSyntax() {
+    public void attributeTypeNoSuperiorNoSyntax() {
         new SchemaBuilder(Schema.getCoreSchema()).addAttributeType(
                 "( parenttype-oid NAME 'parenttype' )", false);
     }
@@ -107,7 +103,7 @@ public void testAttributeTypeNoSuperiorNoSyntax() {
      * attribute types regardless of the order.
      */
     @Test
-    public void testAttributeTypeSuperiorFailureChildThenParent() {
+    public void attributeTypeSuperiorFailureChildThenParent() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).addAttributeType(
                         "( childtype-oid NAME 'childtype' SUP parenttype )", false)
@@ -134,7 +130,7 @@ public void testAttributeTypeSuperiorFailureChildThenParent() {
      * attribute types regardless of the order.
      */
     @Test
-    public void testAttributeTypeSuperiorFailureParentThenChild() {
+    public void attributeTypeSuperiorFailureParentThenChild() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).addAttributeType(
                         "( parenttype-oid NAME 'parenttype' SUP xxx )", false).addAttributeType(
@@ -155,12 +151,9 @@ public void testAttributeTypeSuperiorFailureParentThenChild() {
         }
     }
 
-    /**
-     * Test for OPENDJ-156: Errors when parsing collective attribute
-     * definitions.
-     */
+    /** Test for OPENDJ-156: Errors when parsing collective attribute definitions. */
     @Test
-    public void testCollectiveAttribute() {
+    public void collectiveAttribute() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).addAttributeType(
                         "( 2.5.4.11.1 NAME 'c-ou' "
@@ -174,18 +167,16 @@ public void testCollectiveAttribute() {
      * another and take advantage of copy on write.
      */
     @Test
-    public void testCopyOnWriteNoChanges() {
+    public void copyOnWriteNoChanges() {
         final Schema baseSchema = Schema.getCoreSchema();
         final Schema schema = new SchemaBuilder(baseSchema).toSchema();
 
         assertThat(schema).isSameAs(baseSchema);
     }
 
-    /**
-     * Tests that it is possible to create a schema which is based on another.
-     */
+    /** Tests that it is possible to create a schema which is based on another. */
     @Test
-    public void testCopyOnWriteWithChanges() {
+    public void copyOnWriteWithChanges() {
         final Schema baseSchema = Schema.getCoreSchema();
         final Schema schema =
                 new SchemaBuilder(baseSchema).addAttributeType(
@@ -200,11 +191,9 @@ public void testCopyOnWriteWithChanges() {
                 .isEqualTo(baseSchema.getOption(ALLOW_MALFORMED_NAMES_AND_OPTIONS));
     }
 
-    /**
-     * Tests that it is possible to create an empty schema.
-     */
+    /** Tests that it is possible to create an empty schema. */
     @Test
-    public void testCreateEmptySchema() {
+    public void createEmptySchema() {
         final Schema schema = new SchemaBuilder().toSchema();
         assertThat(schema.getAttributeTypes()).isEmpty();
         assertThat(schema.getObjectClasses()).isEmpty();
@@ -216,12 +205,9 @@ public void testCreateEmptySchema() {
         // Could go on...
     }
 
-    /**
-     * Tests that multiple consecutive invocations of toSchema return the exact
-     * same schema.
-     */
+    /** Tests that multiple consecutive invocations of toSchema return the exact same schema. */
     @Test
-    public void testMultipleToSchema1() {
+    public void multipleToSchema1() {
         final Schema baseSchema = Schema.getCoreSchema();
         final SchemaBuilder builder = new SchemaBuilder(baseSchema);
         final Schema schema1 = builder.toSchema();
@@ -230,12 +216,9 @@ public void testMultipleToSchema1() {
         assertThat(schema1).isSameAs(schema2);
     }
 
-    /**
-     * Tests that multiple consecutive invocations of toSchema return the exact
-     * same schema.
-     */
+    /** Tests that multiple consecutive invocations of toSchema return the exact same schema. */
     @Test
-    public void testMultipleToSchema2() {
+    public void multipleToSchema2() {
         final SchemaBuilder builder =
                 new SchemaBuilder().addAttributeType(
                         "( testtype-oid NAME 'testtype' SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )",
@@ -252,7 +235,7 @@ public void testMultipleToSchema2() {
      * object classes regardless of the order in which they were added.
      */
     @Test
-    public void testObjectClassDependenciesChildThenParent() {
+    public void objectClassDependenciesChildThenParent() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).addObjectClass(
                         "( childtype-oid NAME 'childtype' SUP parenttype STRUCTURAL MUST sn )",
@@ -272,7 +255,7 @@ public void testObjectClassDependenciesChildThenParent() {
      * object classes regardless of the order in which they were added.
      */
     @Test
-    public void testObjectClassDependenciesParentThenChild() {
+    public void objectClassDependenciesParentThenChild() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                         .addObjectClass(
@@ -294,7 +277,7 @@ public void testObjectClassDependenciesParentThenChild() {
      * object classes regardless of the order.
      */
     @Test
-    public void testObjectClassSuperiorFailureChildThenParent() {
+    public void objectClassSuperiorFailureChildThenParent() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).addObjectClass(
                         "( childtype-oid NAME 'childtype' SUP parenttype STRUCTURAL MUST sn )",
@@ -322,7 +305,7 @@ public void testObjectClassSuperiorFailureChildThenParent() {
      * object classes regardless of the order.
      */
     @Test
-    public void testObjectClassSuperiorFailureParentThenChild() {
+    public void objectClassSuperiorFailureParentThenChild() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                         .addObjectClass(
@@ -347,12 +330,9 @@ public void testObjectClassSuperiorFailureParentThenChild() {
         }
     }
 
-    /**
-     * Tests that a schema builder can be re-used after toSchema has been
-     * called.
-     */
+    /** Tests that a schema builder can be re-used after toSchema has been called. */
     @Test
-    public void testReuseSchemaBuilder() {
+    public void reuseSchemaBuilder() {
         final SchemaBuilder builder = new SchemaBuilder();
         final Schema schema1 =
                 builder.addAttributeType(
@@ -377,7 +357,7 @@ public void testReuseSchemaBuilder() {
      * @throws Exception
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public final void testSchemaBuilderDoesntAllowNullEntry() throws Exception {
+    public final void schemaBuilderDoesntAllowNullEntry() throws Exception {
         new SchemaBuilder((Entry) null);
     }
 
@@ -387,7 +367,7 @@ public final void testSchemaBuilderDoesntAllowNullEntry() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryWithCoreSchema() throws Exception {
+    public final void schemaBuilderWithEntryWithCoreSchema() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -439,7 +419,7 @@ public final void testSchemaBuilderWithEntryWithCoreSchema() throws Exception {
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderWithEntryWithoutCoreSchema() throws Exception {
+    public final void schemaBuilderWithEntryWithoutCoreSchema() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -475,7 +455,7 @@ public final void testSchemaBuilderWithEntryWithoutCoreSchema() throws Exception
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAttributeWithoutSpace() throws Exception {
+    public final void schemaBuilderAttributeWithoutSpace() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -513,7 +493,7 @@ public final void testSchemaBuilderAttributeWithoutSpace() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAttributeExtensionWithoutSpace() throws Exception {
+    public final void schemaBuilderAttributeExtensionWithoutSpace() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -551,7 +531,7 @@ public final void testSchemaBuilderAttributeExtensionWithoutSpace() throws Excep
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddLdapSyntax() throws Exception {
+    public final void schemaBuilderWithEntryAddLdapSyntax() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -592,7 +572,7 @@ public final void testSchemaBuilderWithEntryAddLdapSyntax() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMalformedLdapSyntax() throws Exception {
+    public final void schemaBuilderWithEntryAddMalformedLdapSyntax() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -631,7 +611,7 @@ public final void testSchemaBuilderWithEntryAddMalformedLdapSyntax() throws Exce
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMatchingRuleUse() throws Exception {
+    public final void schemaBuilderWithEntryAddMatchingRuleUse() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -673,7 +653,7 @@ public final void testSchemaBuilderWithEntryAddMatchingRuleUse() throws Exceptio
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMalformedMatchingRuleUse() throws Exception {
+    public final void schemaBuilderWithEntryAddMalformedMatchingRuleUse() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -712,7 +692,7 @@ public final void testSchemaBuilderWithEntryAddMalformedMatchingRuleUse() throws
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMatchingRule() throws Exception {
+    public final void schemaBuilderWithEntryAddMatchingRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -755,7 +735,7 @@ public final void testSchemaBuilderWithEntryAddMatchingRule() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMalformedMatchingRule() throws Exception {
+    public final void schemaBuilderWithEntryAddMalformedMatchingRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -795,7 +775,7 @@ public final void testSchemaBuilderWithEntryAddMalformedMatchingRule() throws Ex
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddDITContentRule() throws Exception {
+    public final void schemaBuilderWithEntryAddDITContentRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -838,7 +818,7 @@ public final void testSchemaBuilderWithEntryAddDITContentRule() throws Exception
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMalformedDITContentRule() throws Exception {
+    public final void schemaBuilderWithEntryAddMalformedDITContentRule() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -878,7 +858,7 @@ public final void testSchemaBuilderWithEntryAddMalformedDITContentRule() throws
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddObjectClass() throws Exception {
+    public final void schemaBuilderWithEntryAddObjectClass() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -919,7 +899,7 @@ public final void testSchemaBuilderWithEntryAddObjectClass() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderWithEntryAddMalformedObjectClass() throws Exception {
+    public final void schemaBuilderWithEntryAddMalformedObjectClass() throws Exception {
         // @formatter:off
         final String[] strEntry = {
             "dn: cn=schema",
@@ -960,7 +940,7 @@ public final void testSchemaBuilderWithEntryAddMalformedObjectClass() throws Exc
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAddAttributeWithEntryContainingDescriptionWithCoreSchema()
+    public final void schemaBuilderAddAttributeWithEntryContainingDescriptionWithCoreSchema()
             throws Exception {
         // @formatter:off
         final String[] strEntry = {
@@ -1015,9 +995,8 @@ public final void testSchemaBuilderAddAttributeWithEntryContainingDescriptionWit
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAddAttributeContainingDescriptionWithCoreSchema()
+    public final void schemaBuilderAddAttributeContainingDescriptionWithCoreSchema()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Adding the new schema containing the customclass
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
@@ -1050,8 +1029,7 @@ public final void testSchemaBuilderAddAttributeContainingDescriptionWithCoreSche
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddAttributeDoesntAllowWrongUsage() throws Exception {
-
+    public final void schemaBuilderAddAttributeDoesntAllowWrongUsage() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Adding the new schema containing the customclass
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
@@ -1068,7 +1046,7 @@ public final void testSchemaBuilderAddAttributeDoesntAllowWrongUsage() throws Ex
      * @throws Exception
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public final void testSchemaBuilderAddAttributeTypeDoesntAllowNull() throws Exception {
+    public final void schemaBuilderAddAttributeTypeDoesntAllowNull() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Adding the new schema containing the customclass
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
@@ -1082,14 +1060,12 @@ public final void testSchemaBuilderAddAttributeTypeDoesntAllowNull() throws Exce
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddAttributeTypeDoesntAllowEmptyString() throws Exception {
-
+    public final void schemaBuilderAddAttributeTypeDoesntAllowEmptyString() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Adding the new schema containing the customclass
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
                 + "' SUP top AUXILIARY MAY myCustomAttribute )", false);
         scBuild.addAttributeType(" ", false);
-
     }
 
     /**
@@ -1099,9 +1075,8 @@ public final void testSchemaBuilderAddAttributeTypeDoesntAllowEmptyString() thro
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddAttributeDoesntAllowLeftParenthesisMising()
+    public final void schemaBuilderAddAttributeDoesntAllowLeftParenthesisMising()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
                 + "' SUP top AUXILIARY MAY myCustomAttribute )", false);
@@ -1119,9 +1094,8 @@ public final void testSchemaBuilderAddAttributeDoesntAllowLeftParenthesisMising(
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddAttributeDoesntAllowRightParenthesisMising()
+    public final void schemaBuilderAddAttributeDoesntAllowRightParenthesisMising()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
                 + "' SUP top AUXILIARY MAY myCustomAttribute )", false);
@@ -1139,8 +1113,7 @@ public final void testSchemaBuilderAddAttributeDoesntAllowRightParenthesisMising
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderCompareAddAttributeTypesSucceed() throws Exception {
-
+    public final void schemaBuilderCompareAddAttributeTypesSucceed() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
                 + "' SUP top AUXILIARY MAY myCustomAttribute )", false);
@@ -1188,9 +1161,8 @@ public final void testSchemaBuilderCompareAddAttributeTypesSucceed() throws Exce
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddObjectClassDoesntAllowMalformedObjectClass()
+    public final void schemaBuilderAddObjectClassDoesntAllowMalformedObjectClass()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Left parenthesis is missing underneath
         scBuild.addObjectClass(" temporary-fake-oc-id NAME 'myCustomObjClass"
@@ -1209,9 +1181,8 @@ public final void testSchemaBuilderAddObjectClassDoesntAllowMalformedObjectClass
      * @throws Exception
      */
     @Test(expectedExceptions = LocalizedIllegalArgumentException.class)
-    public final void testSchemaBuilderAddObjectClassDoesntAllowMalformedObjectClassIllegalToken()
+    public final void schemaBuilderAddObjectClassDoesntAllowMalformedObjectClassIllegalToken()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder();
         // Wrong object class definition (AUXI)
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
@@ -1223,11 +1194,9 @@ public final void testSchemaBuilderAddObjectClassDoesntAllowMalformedObjectClass
                 false);
     }
 
-    /**
-     * Rewrite an existing object class.
-     */
+    /** Rewrite an existing object class. */
     @Test
-    public final void testSchemaBuilderAddObjectClass() throws Exception {
+    public final void schemaBuilderAddObjectClass() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(getDefaultSchema());
         scBuild.buildObjectClass("2.5.6.14")
                 .names("device")
@@ -1252,9 +1221,8 @@ public final void testSchemaBuilderAddObjectClass() throws Exception {
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingAttributesOverwriteFalse()
+    public final void schemaBuilderDoesntAllowConflictingAttributesOverwriteFalse()
             throws Exception {
-
         final SchemaBuilder scBuild = new SchemaBuilder();
 
         scBuild.addAttributeType(
@@ -1271,7 +1239,7 @@ public final void testSchemaBuilderDoesntAllowConflictingAttributesOverwriteFals
     }
 
     @Test
-    public final void testSchemaBuilderWithAttributeUsageDifferentFromSuperior() {
+    public final void schemaBuilderWithAttributeUsageDifferentFromSuperior() {
         final SchemaBuilder scBuild = new SchemaBuilder();
 
         // directoryOperation can't inherit from userApplications
@@ -1293,7 +1261,7 @@ public final void testSchemaBuilderWithAttributeUsageDifferentFromSuperior() {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingAttributesOverwriteTrue() throws Exception {
+    public final void schemaBuilderAllowsConflictingAttributesOverwriteTrue() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
 
         //@formatter:off
@@ -1332,7 +1300,7 @@ public final void testSchemaBuilderAllowsConflictingAttributesOverwriteTrue() th
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingDITOverwriteFalse() throws Exception {
+    public final void schemaBuilderDoesntAllowConflictingDITOverwriteFalse() throws Exception {
         //@formatter:off
         new SchemaBuilder(Schema.getDefaultSchema())
                 .addObjectClass(
@@ -1372,7 +1340,7 @@ public final void testSchemaBuilderDoesntAllowConflictingDITOverwriteFalse() thr
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingDITStructureRuleOverwriteTrue()
+    public final void schemaBuilderAllowsConflictingDITStructureRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
         final Schema schema =
@@ -1420,7 +1388,7 @@ public final void testSchemaBuilderAllowsConflictingDITStructureRuleOverwriteTru
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAddDITContentRuleBuilder() throws Exception {
+    public final void schemaBuilderAddDITContentRuleBuilder() throws Exception {
         // @formatter:off
         final Schema schema =
             new SchemaBuilder(Schema.getCoreSchema())
@@ -1449,7 +1417,7 @@ public final void testSchemaBuilderAddDITContentRuleBuilder() throws Exception {
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingDITContentRuleOverwriteFalse()
+    public final void schemaBuilderDoesntAllowConflictingDITContentRuleOverwriteFalse()
             throws Exception {
         // @formatter:off
         new SchemaBuilder(Schema.getDefaultSchema())
@@ -1480,7 +1448,7 @@ public final void testSchemaBuilderDoesntAllowConflictingDITContentRuleOverwrite
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingDITContentRuleOverwriteTrue()
+    public final void schemaBuilderAllowsConflictingDITContentRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
         final Schema schema = new SchemaBuilder(Schema.getDefaultSchema())
@@ -1517,7 +1485,7 @@ public final void testSchemaBuilderAllowsConflictingDITContentRuleOverwriteTrue(
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingMatchingRuleOverwriteFalse()
+    public final void schemaBuilderDoesntAllowConflictingMatchingRuleOverwriteFalse()
             throws Exception {
         // @formatter:off
         new SchemaBuilder(Schema.getDefaultSchema())
@@ -1537,7 +1505,7 @@ public final void testSchemaBuilderDoesntAllowConflictingMatchingRuleOverwriteFa
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingMatchingRuleOverwriteTrue()
+    public final void schemaBuilderAllowsConflictingMatchingRuleOverwriteTrue()
             throws Exception {
         // @formatter:off
         final Schema schema =
@@ -1564,7 +1532,7 @@ public final void testSchemaBuilderAllowsConflictingMatchingRuleOverwriteTrue()
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingMatchingRuleUseOverwriteFalse()
+    public final void schemaBuilderDoesntAllowConflictingMatchingRuleUseOverwriteFalse()
             throws Exception {
         // @formatter:off
         new SchemaBuilder(Schema.getDefaultSchema())
@@ -1583,7 +1551,7 @@ public final void testSchemaBuilderDoesntAllowConflictingMatchingRuleUseOverwrit
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingMatchingRuleUseOverwriteTrue()
+    public final void schemaBuilderAllowsConflictingMatchingRuleUseOverwriteTrue()
             throws Exception {
         // @formatter:off
         final Schema schema =
@@ -1607,7 +1575,6 @@ public final void testSchemaBuilderAllowsConflictingMatchingRuleUseOverwriteTrue
                             + " X-ORIGIN 'RFC 4512' )");
         }
         assertThat(schema.getWarnings()).isEmpty();
-
     }
 
     /**
@@ -1617,7 +1584,7 @@ public final void testSchemaBuilderAllowsConflictingMatchingRuleUseOverwriteTrue
      * @throws Exception
      */
     @Test(expectedExceptions = ConflictingSchemaElementException.class)
-    public final void testSchemaBuilderDoesntAllowConflictingNameFormOverwriteFalse()
+    public final void schemaBuilderDoesntAllowConflictingNameFormOverwriteFalse()
             throws Exception {
         // @formatter:off
         new SchemaBuilder(Schema.getDefaultSchema())
@@ -1641,7 +1608,7 @@ public final void testSchemaBuilderDoesntAllowConflictingNameFormOverwriteFalse(
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAllowsConflictingNameFormOverwriteTrue() throws Exception {
+    public final void schemaBuilderAllowsConflictingNameFormOverwriteTrue() throws Exception {
         // @formatter:off
         final Schema schema =
             new SchemaBuilder(Schema.getDefaultSchema())
@@ -1679,8 +1646,7 @@ public final void testSchemaBuilderAllowsConflictingNameFormOverwriteTrue() thro
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveAttributeType() throws Exception {
-
+    public final void schemaBuilderRemoveAttributeType() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
         scBuild.addObjectClass("( temporary-fake-oc-id NAME 'myCustomObjClass"
                 + "' SUP top AUXILIARY MAY myCustomAttribute )", false);
@@ -1703,7 +1669,7 @@ public final void testSchemaBuilderRemoveAttributeType() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantAttributeType() throws Exception {
+    public final void schemaBuilderRemoveInexistantAttributeType() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeAttributeType("wrongName");
         assertThat(isRemoved).isFalse();
@@ -1715,7 +1681,7 @@ public final void testSchemaBuilderRemoveInexistantAttributeType() throws Except
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantSyntax() throws Exception {
+    public final void schemaBuilderRemoveInexistantSyntax() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeSyntax("1.3.6.1.4.1.14aa");
         assertThat(isRemoved).isFalse();
@@ -1727,8 +1693,7 @@ public final void testSchemaBuilderRemoveInexistantSyntax() throws Exception {
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveSyntax() throws Exception {
-
+    public final void schemaBuilderRemoveSyntax() throws Exception {
         assertThat(Schema.getCoreSchema().getSyntax("1.3.6.1.4.1.1466.115.121.1.15")).isNotNull();
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getDefaultSchema());
 
@@ -1744,7 +1709,7 @@ public final void testSchemaBuilderRemoveSyntax() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveDitContentRule() throws Exception {
+    public final void schemaBuilderRemoveDitContentRule() throws Exception {
         // @formatter:off
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         scBuild.addObjectClass("( 2.16.840.1.113730.3.2.2 NAME 'myCustomObjClass"
@@ -1770,7 +1735,7 @@ public final void testSchemaBuilderRemoveDitContentRule() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantDitContentRule() throws Exception {
+    public final void schemaBuilderRemoveInexistantDitContentRule() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeDITContentRule("badDITContentRule");
         assertThat(isRemoved).isFalse();
@@ -1782,8 +1747,7 @@ public final void testSchemaBuilderRemoveInexistantDitContentRule() throws Excep
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveDitStructureRule() throws Exception {
-
+    public final void schemaBuilderRemoveDitStructureRule() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         scBuild.addObjectClass(
                 "( testditstructureruleconstraintssupoc-oid "
@@ -1819,7 +1783,7 @@ public final void testSchemaBuilderRemoveDitStructureRule() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantDitStructureRule() throws Exception {
+    public final void schemaBuilderRemoveInexistantDitStructureRule() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeDITStructureRule(999014);
         assertThat(isRemoved).isFalse();
@@ -1831,8 +1795,7 @@ public final void testSchemaBuilderRemoveInexistantDitStructureRule() throws Exc
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveMatchingRule() throws Exception {
-
+    public final void schemaBuilderRemoveMatchingRule() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         scBuild.addMatchingRule(
                 // Matching rules from RFC 2252
@@ -1852,7 +1815,7 @@ public final void testSchemaBuilderRemoveMatchingRule() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantMatchingRule() throws Exception {
+    public final void schemaBuilderRemoveInexistantMatchingRule() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeMatchingRule("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1864,8 +1827,7 @@ public final void testSchemaBuilderRemoveInexistantMatchingRule() throws Excepti
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveMatchingRuleUSe() throws Exception {
-
+    public final void schemaBuilderRemoveMatchingRuleUSe() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         scBuild.addMatchingRuleUse(
                 "( 2.5.13.16 NAME 'bitStringMatch' APPLIES ( givenName $ surname ) )", false);
@@ -1883,7 +1845,7 @@ public final void testSchemaBuilderRemoveMatchingRuleUSe() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantMatchingRuleUse() throws Exception {
+    public final void schemaBuilderRemoveInexistantMatchingRuleUse() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeMatchingRuleUse("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1895,8 +1857,7 @@ public final void testSchemaBuilderRemoveInexistantMatchingRuleUse() throws Exce
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveNameForm() throws Exception {
-
+    public final void schemaBuilderRemoveNameForm() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         scBuild.addNameForm("( testviolatessinglevaluednameform-oid "
                 + "NAME 'testViolatesSingleValuedNameForm' "
@@ -1915,7 +1876,7 @@ public final void testSchemaBuilderRemoveNameForm() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantNameForm() throws Exception {
+    public final void schemaBuilderRemoveInexistantNameForm() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeNameForm("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1927,8 +1888,7 @@ public final void testSchemaBuilderRemoveInexistantNameForm() throws Exception {
      * @throws Exception
      */
     @Test(expectedExceptions = UnknownSchemaElementException.class)
-    public final void testSchemaBuilderRemoveObjectClass() throws Exception {
-
+    public final void schemaBuilderRemoveObjectClass() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder();
         scBuild.addObjectClass("( 2.5.6.6 NAME 'person' SUP top STRUCTURAL MUST ( sn $ cn )"
                 + " MAY ( userPassword $ telephoneNumber $ seeAlso $ description )"
@@ -1946,7 +1906,7 @@ public final void testSchemaBuilderRemoveObjectClass() throws Exception {
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderRemoveInexistantObjectClass() throws Exception {
+    public final void schemaBuilderRemoveInexistantObjectClass() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         boolean isRemoved = scBuild.removeObjectClass("bitStringMatchZ");
         assertThat(isRemoved).isFalse();
@@ -1958,8 +1918,7 @@ public final void testSchemaBuilderRemoveInexistantObjectClass() throws Exceptio
      * @throws Exception
      */
     @Test(expectedExceptions = NullPointerException.class)
-    public final void testSchemaBuilderAddSchemaForEntryDoesntAllowNull() throws Exception {
-
+    public final void schemaBuilderAddSchemaForEntryDoesntAllowNull() throws Exception {
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
         scBuild.addSchemaForEntry(null, null, false);
     }
@@ -1973,7 +1932,7 @@ public final void testSchemaBuilderAddSchemaForEntryDoesntAllowNull() throws Exc
      * @throws Exception
      */
     @Test(expectedExceptions = EntryNotFoundException.class)
-    public final void testSchemaBuilderAddSchemaForEntryDoesntContainSubschemaMockConnection()
+    public final void schemaBuilderAddSchemaForEntryDoesntContainSubschemaMockConnection()
             throws Exception {
         Connection connection = mock(Connection.class);
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
@@ -1996,7 +1955,6 @@ public final void testSchemaBuilderAddSchemaForEntryDoesntContainSubschemaMockCo
 
         scBuild.addSchemaForEntry(connection,
                 DN.valueOf("uid=scarter,ou=People,dc=example,dc=com"), false);
-
     }
 
     /**
@@ -2005,7 +1963,7 @@ public final void testSchemaBuilderAddSchemaForEntryDoesntContainSubschemaMockCo
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAddSchemaForEntryMockConnection() throws Exception {
+    public final void schemaBuilderAddSchemaForEntryMockConnection() throws Exception {
         Connection connection = mock(Connection.class);
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
 
@@ -2055,7 +2013,7 @@ public final void testSchemaBuilderAddSchemaForEntryMockConnection() throws Exce
      * @throws Exception
      */
     @Test
-    public final void testSchemaBuilderAddSchemaForEntryAsyncMockConnection() throws Exception {
+    public final void schemaBuilderAddSchemaForEntryAsyncMockConnection() throws Exception {
         Connection connection = mock(Connection.class);
         final SchemaBuilder scBuild = new SchemaBuilder(Schema.getCoreSchema());
 
@@ -2098,7 +2056,7 @@ public final void testSchemaBuilderAddSchemaForEntryAsyncMockConnection() throws
     }
 
     @Test
-    public void testDefaultSyntax() {
+    public void defaultSyntax() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).toSchema().asNonStrictSchema();
         assertThat(schema.getDefaultSyntax()).isEqualTo(CoreSchema.getOctetStringSyntax());
@@ -2107,7 +2065,7 @@ public void testDefaultSyntax() {
     }
 
     @Test
-    public void testOverrideDefaultSyntax() {
+    public void overrideDefaultSyntax() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                     .setOption(DEFAULT_SYNTAX_OID, getDirectoryStringSyntax().getOID())
@@ -2117,7 +2075,7 @@ public void testOverrideDefaultSyntax() {
     }
 
     @Test
-    public void testDefaultMatchingRule() {
+    public void defaultMatchingRule() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema()).toSchema().asNonStrictSchema();
         assertThat(schema.getDefaultMatchingRule()).isEqualTo(
@@ -2127,7 +2085,7 @@ public void testDefaultMatchingRule() {
     }
 
     @Test
-    public void testOverrideMatchingRule() {
+    public void overrideMatchingRule() {
         final Schema schema =
                 new SchemaBuilder(Schema.getCoreSchema())
                     .setOption(DEFAULT_MATCHING_RULE_OID, getCaseIgnoreMatchingRule().getOID())
@@ -2139,7 +2097,7 @@ public void testOverrideMatchingRule() {
     }
 
     @Test
-    public void testDefaultSyntaxDefinedInSchema() {
+    public void defaultSyntaxDefinedInSchema() {
         // The next line was triggering a NPE with OPENDJ-1252.
         final Schema schema =
                 new SchemaBuilder().addSyntax("( 9.9.9 DESC 'Test Syntax' )", false).addSyntax(
@@ -2151,7 +2109,7 @@ public void testDefaultSyntaxDefinedInSchema() {
     }
 
     @Test
-    public void testDefaultMatchingRuleDefinedInSchema() throws DecodeException {
+    public void defaultMatchingRuleDefinedInSchema() throws DecodeException {
         final Schema schema =
                 new SchemaBuilder().addSyntax(CoreSchema.getOctetStringSyntax().toString(), false)
                         .addMatchingRule(
@@ -2165,5 +2123,4 @@ public void testDefaultMatchingRuleDefinedInSchema() throws DecodeException {
                 schema.getMatchingRule("9.9.9").normalizeAttributeValue(ByteString.valueOfUtf8("test")))
                 .isEqualTo(ByteString.valueOfUtf8("test"));
     }
-
 }

From f91d9067ce13d069daf556a101770450a0c256cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Tue, 2 Feb 2016 08:59:07 +0100
Subject: [PATCH 037/125] When removing enum syntaxes, also remove the
 corresponding ordering matching rule.

SchemaBuilder.java:
In removeSyntax(Syntax), also removed the ordering matching rule associated to an enum syntax.
Removed code duplication by extracting method addEnumerationSyntax0().
---
 .../opendj/ldap/schema/SchemaBuilder.java     | 42 ++++++++++---------
 .../ldap/schema/SchemaBuilderTestCase.java    | 24 +++++++++++
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
index bb27db7ac..8f201124e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
@@ -71,11 +71,11 @@
 import org.forgerock.opendj.ldap.requests.SearchRequest;
 import org.forgerock.opendj.ldap.responses.SearchResultEntry;
 import org.forgerock.opendj.ldap.schema.DITContentRule.Builder;
-import org.forgerock.util.Options;
-import org.forgerock.util.Reject;
 import org.forgerock.util.AsyncFunction;
 import org.forgerock.util.Function;
 import org.forgerock.util.Option;
+import org.forgerock.util.Options;
+import org.forgerock.util.Reject;
 import org.forgerock.util.promise.Promise;
 
 import com.forgerock.opendj.util.StaticUtils;
@@ -625,20 +625,26 @@ public SchemaBuilder addDITStructureRule(final String definition, final boolean
     public SchemaBuilder addEnumerationSyntax(final String oid, final String description,
             final boolean overwrite, final String... enumerations) {
         Reject.ifNull((Object) enumerations);
-
         lazyInitBuilder();
 
-        final EnumSyntaxImpl enumImpl = new EnumSyntaxImpl(oid, Arrays.asList(enumerations));
-
+        final List enumEntries = Arrays.asList(enumerations);
         final Syntax.Builder syntaxBuilder = buildSyntax(oid).description(description)
-                .extraProperties(Collections.singletonMap("X-ENUM", Arrays.asList(enumerations)))
-                .implementation(enumImpl);
+            .extraProperties(Collections.singletonMap("X-ENUM", enumEntries));
+        addEnumerationSyntax0(syntaxBuilder, oid, enumEntries, overwrite);
+        return this;
+    }
 
-        syntaxBuilder.addToSchema(overwrite);
+    private void addEnumerationSyntax0(final Syntax.Builder syntaxBuilder,
+            final String oid, final List enumEntries, final boolean overwrite) {
+        final EnumSyntaxImpl enumImpl = new EnumSyntaxImpl(oid, enumEntries);
+
+        syntaxBuilder
+                .implementation(enumImpl)
+                .addToSchema(overwrite);
 
         try {
             buildMatchingRule(enumImpl.getOrderingMatchingRule())
-                    .names(OMR_GENERIC_ENUM_NAME + oid)
+                    .names(OMR_GENERIC_ENUM_NAME + "." + oid)
                     .syntaxOID(oid)
                     .extraProperties(CoreSchemaImpl.OPENDS_ORIGIN)
                     .implementation(new EnumOrderingMatchingRule(enumImpl))
@@ -646,7 +652,6 @@ public SchemaBuilder addEnumerationSyntax(final String oid, final String descrip
         } catch (final ConflictingSchemaElementException e) {
             removeSyntax(oid);
         }
-        return this;
     }
 
     /**
@@ -1849,16 +1854,7 @@ public SchemaBuilder addSyntax(final String definition, final boolean overwrite)
             // See if it is a enum syntax
             for (final Map.Entry> property : syntaxBuilder.getExtraProperties().entrySet()) {
                 if ("x-enum".equalsIgnoreCase(property.getKey())) {
-                    final EnumSyntaxImpl enumImpl = new EnumSyntaxImpl(oid, property.getValue());
-                    syntaxBuilder.implementation(enumImpl);
-                    syntaxBuilder.addToSchema(overwrite);
-
-                    buildMatchingRule(enumImpl.getOrderingMatchingRule())
-                        .names(OMR_GENERIC_ENUM_NAME + "." + oid)
-                        .syntaxOID(oid)
-                        .extraProperties(CoreSchemaImpl.OPENDS_ORIGIN)
-                        .implementation(new EnumOrderingMatchingRule(enumImpl))
-                        .addToSchemaOverwrite();
+                    addEnumerationSyntax0(syntaxBuilder, oid, property.getValue(), overwrite);
                     return this;
                 }
             }
@@ -2597,6 +2593,12 @@ private void removeObjectClass(final ObjectClass oc) {
     }
 
     private void removeSyntax(final Syntax syntax) {
+        for (Map.Entry> property : syntax.getExtraProperties().entrySet()) {
+            if ("x-enum".equalsIgnoreCase(property.getKey())) {
+                removeMatchingRule(OMR_GENERIC_ENUM_NAME + "." + syntax.getOID());
+                break;
+            }
+        }
         numericOID2Syntaxes.remove(syntax.getOID());
     }
 
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
index a8e00f85a..362bd9376 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
+++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java
@@ -2123,4 +2123,28 @@ public void defaultMatchingRuleDefinedInSchema() throws DecodeException {
                 schema.getMatchingRule("9.9.9").normalizeAttributeValue(ByteString.valueOfUtf8("test")))
                 .isEqualTo(ByteString.valueOfUtf8("test"));
     }
+
+    @Test
+    public void enumSyntaxAddThenRemove() {
+        final Schema coreSchema = Schema.getCoreSchema();
+        final Schema schemaWithEnum = new SchemaBuilder(coreSchema)
+            .addSyntax("( 3.3.3  DESC 'Day Of The Week'  "
+                    + "X-ENUM  ( 'monday' 'tuesday'   'wednesday'  'thursday'  'friday'  'saturday' 'sunday') )",
+                    false)
+            .toSchema();
+
+        assertThat(schemaWithEnum.getWarnings()).isEmpty();
+        assertThat(schemaWithEnum.getMatchingRules())
+            .as("Expected an enum ordering matching rule to be added for the enum syntax")
+            .hasSize(coreSchema.getMatchingRules().size() + 1);
+
+        final SchemaBuilder builder = new SchemaBuilder(schemaWithEnum);
+        assertThat(builder.removeSyntax("3.3.3")).isTrue();
+        final Schema schemaNoEnum = builder.toSchema();
+
+        assertThat(schemaNoEnum.getWarnings()).isEmpty();
+        assertThat(schemaNoEnum.getMatchingRules())
+            .as("Expected the enum ordering matching rule to be removed at the same time as the enum syntax")
+            .hasSize(coreSchema.getMatchingRules().size());
+    }
 }

From f4c971636861edda046ca3b1ae71991bb1c281fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Tue, 2 Feb 2016 09:08:53 +0100
Subject: [PATCH 038/125] *.java: Added addToSchema(boolean overwrite) method
 to all schema elements.

---
 .../opendj/ldap/schema/AttributeType.java     | 12 +++++++
 .../opendj/ldap/schema/DITContentRule.java    | 14 +++++++-
 .../opendj/ldap/schema/DITStructureRule.java  | 14 +++++++-
 .../opendj/ldap/schema/MatchingRule.java      | 14 +++++++-
 .../opendj/ldap/schema/MatchingRuleUse.java   | 12 +++++++
 .../opendj/ldap/schema/NameForm.java          | 12 +++++++
 .../opendj/ldap/schema/ObjectClass.java       | 14 +++++++-
 .../opendj/ldap/schema/SchemaBuilder.java     | 34 +++++--------------
 .../forgerock/opendj/ldap/schema/Syntax.java  |  7 ++--
 9 files changed, 99 insertions(+), 34 deletions(-)

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
index d1d489771..f7703fce1 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java
@@ -121,6 +121,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addAttributeType(new AttributeType(this), true);
         }
 
+        /**
+         * Adds this attribute type to the schema, overwriting any existing attribute type
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any attribute type with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         /**
          * Sets the matching rule that should be used for approximate matching
          * with this attribute type.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
index 7f088344d..423de9834 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS
+ *      Portions copyright 2011-2016 ForgeRock AS
  */
 package org.forgerock.opendj.ldap.schema;
 
@@ -103,6 +103,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addDITContentRule(new DITContentRule(this), true);
         }
 
+        /**
+         * Adds this DIT content rule to the schema, overwriting any existing DIT content rule
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any DIT content rule with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         /**
          * Adds the provided auxiliary classes to the list of auxiliary object
          * classes that entries subject to this DIT content rule may belong to.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
index 8ee8a8409..3349ca8da 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2015 ForgeRock AS
+ *      Portions copyright 2015-2016 ForgeRock AS
  */
 
 package org.forgerock.opendj.ldap.schema;
@@ -98,6 +98,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addDITStructureRule(new DITStructureRule(this), true);
         }
 
+        /**
+         * Adds this DIT structure rule to the schema, overwriting any existing DIT structure rule
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any DIT structure rule with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         @Override
         public Builder description(final String description) {
             return description0(description);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
index c282e4281..234505a6e 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009-2010 Sun Microsystems, Inc.
- *      Portions copyright 2013-2015 ForgeRock AS.
+ *      Portions copyright 2013-2016 ForgeRock AS.
  */
 package org.forgerock.opendj.ldap.schema;
 
@@ -105,6 +105,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addMatchingRule(new MatchingRule(this), true);
         }
 
+        /**
+         * Adds this matching rule to the schema, overwriting any existing matching rule
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any matching rule with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         @Override
         public Builder description(final String description) {
             return description0(description);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
index 4bdda4b49..052152242 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java
@@ -95,6 +95,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addMatchingRuleUse(new MatchingRuleUse(this), true);
         }
 
+        /**
+         * Adds this matching rule use to the schema, overwriting any existing matching rule use
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any matching rule use with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         /**
          * Adds the provided list of attribute types to the list of attribute
          * type the matching rule applies to.
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
index e3cc54cde..fbd1e7a00 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java
@@ -100,6 +100,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addNameForm(new NameForm(this), true);
         }
 
+        /**
+         * Adds this name form to the schema, overwriting any existing name form
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any name form with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         @Override
         public Builder description(final String description) {
             return description0(description);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
index 48c4d5f40..4d939d415 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2015 ForgeRock AS.
+ *      Portions copyright 2015-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.schema;
@@ -109,6 +109,18 @@ public SchemaBuilder addToSchemaOverwrite() {
             return getSchemaBuilder().addObjectClass(new ObjectClass(this), true);
         }
 
+        /**
+         * Adds this object class to the schema, overwriting any existing object class
+         * with the same numeric OID if the overwrite parameter is set to {@code true}.
+         *
+         * @param overwrite
+         *            {@code true} if any object class with the same OID should be overwritten.
+         * @return The parent schema builder.
+         */
+        SchemaBuilder addToSchema(final boolean overwrite) {
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
+        }
+
         @Override
         public Builder description(final String description) {
             return description0(description);
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
index 8f201124e..20e414c64 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java
@@ -383,7 +383,7 @@ public SchemaBuilder addAttributeType(final String definition, final boolean ove
             atBuilder.superiorType(superiorType)
                      .syntax(syntax);
 
-            return overwrite ? atBuilder.addToSchemaOverwrite() : atBuilder.addToSchema();
+            return atBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg = ERR_ATTR_SYNTAX_ATTRTYPE_INVALID1.get(definition, e.getMessageObject());
             throw new LocalizedIllegalArgumentException(msg, e.getCause());
@@ -490,7 +490,7 @@ public SchemaBuilder addDITContentRule(final String definition, final boolean ov
                 }
             }
 
-            return overwrite ? contentRuleBuilder.addToSchemaOverwrite() : contentRuleBuilder.addToSchema();
+            return contentRuleBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg = ERR_ATTR_SYNTAX_DCR_INVALID1.get(definition, e.getMessageObject());
             throw new LocalizedIllegalArgumentException(msg, e.getCause());
@@ -597,7 +597,7 @@ public SchemaBuilder addDITStructureRule(final String definition, final boolean
             }
             ruleBuilder.nameForm(nameForm);
 
-            return overwrite ? ruleBuilder.addToSchemaOverwrite() : ruleBuilder.addToSchema();
+            return ruleBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg = ERR_ATTR_SYNTAX_DSR_INVALID1.get(definition, e.getMessageObject());
             throw new LocalizedIllegalArgumentException(msg, e.getCause());
@@ -755,11 +755,7 @@ public SchemaBuilder addMatchingRule(final String definition, final boolean over
             if (syntax == null) {
                 throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_MR_NO_SYNTAX.get(definition));
             }
-            if (overwrite) {
-                matchingRuleBuilder.addToSchemaOverwrite();
-            } else {
-                matchingRuleBuilder.addToSchema();
-            }
+            matchingRuleBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg =
                     ERR_ATTR_SYNTAX_MR_INVALID1.get(definition, e.getMessageObject());
@@ -868,7 +864,7 @@ public SchemaBuilder addMatchingRuleUse(final String definition, final boolean o
             }
             useBuilder.attributes(attributes);
 
-            return overwrite ? useBuilder.addToSchemaOverwrite() : useBuilder.addToSchema();
+            return useBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg = ERR_ATTR_SYNTAX_MRUSE_INVALID1.get(definition, e.getMessageObject());
             throw new LocalizedIllegalArgumentException(msg, e.getCause());
@@ -1066,11 +1062,7 @@ public SchemaBuilder addNameForm(final String definition, final boolean overwrit
                 throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_NAME_FORM_NO_REQUIRED_ATTR.get(definition));
             }
 
-            if (overwrite) {
-                nameFormBuilder.addToSchemaOverwrite();
-            } else {
-                nameFormBuilder.addToSchema();
-            }
+            nameFormBuilder.addToSchema(overwrite);
         } catch (final DecodeException e) {
             final LocalizableMessage msg =
                     ERR_ATTR_SYNTAX_NAME_FORM_INVALID1.get(definition, e.getMessageObject());
@@ -1401,7 +1393,7 @@ public SchemaBuilder addObjectClass(final String definition, final boolean overw
                 }
                 ocBuilder.superiorObjectClasses(superiorClasses)
                          .type(ocType);
-                return overwrite ? ocBuilder.addToSchemaOverwrite() : ocBuilder.addToSchema();
+                return ocBuilder.addToSchema(overwrite);
             }
         } catch (final DecodeException e) {
             throw new LocalizedIllegalArgumentException(
@@ -2364,19 +2356,11 @@ private void addSchema0(final Schema schema, final boolean overwrite) {
         // unlikely, may be different in the new schema.
 
         for (final Syntax syntax : schema.getSyntaxes()) {
-            if (overwrite) {
-                buildSyntax(syntax, false).addToSchemaOverwrite();
-            } else {
-                buildSyntax(syntax, false).addToSchema();
-            }
+            buildSyntax(syntax, false).addToSchema(overwrite);
         }
 
         for (final MatchingRule matchingRule : schema.getMatchingRules()) {
-            if (overwrite) {
-                buildMatchingRule(matchingRule, false).addToSchemaOverwrite();
-            } else {
-                buildMatchingRule(matchingRule, false).addToSchema();
-            }
+            buildMatchingRule(matchingRule, false).addToSchema(overwrite);
         }
 
         for (final MatchingRuleUse matchingRuleUse : schema.getMatchingRuleUses()) {
diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
index c651cc46f..9db3a7dc3 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2009 Sun Microsystems, Inc.
- *      Portions copyright 2013-2014 ForgeRock AS.
+ *      Portions copyright 2013-2016 ForgeRock AS.
  */
 
 package org.forgerock.opendj.ldap.schema;
@@ -103,10 +103,7 @@ public SchemaBuilder addToSchemaOverwrite() {
          * @return The parent schema builder.
          */
         SchemaBuilder addToSchema(final boolean overwrite) {
-            if (overwrite) {
-                return addToSchemaOverwrite();
-            }
-            return addToSchema();
+            return overwrite ? addToSchemaOverwrite() : addToSchema();
         }
 
         @Override

From bd143dd0c777c294061adca4ad319a3a2a329e0c Mon Sep 17 00:00:00 2001
From: Mark Craig 
Date: Wed, 3 Feb 2016 15:00:01 +0100
Subject: [PATCH 039/125] Update site skin

---
 .../images/FR_plogo_org_FC_openDJ-302x86.png    | Bin 0 -> 22823 bytes
 src/site/site.xml                               |   6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 src/site/resources/images/FR_plogo_org_FC_openDJ-302x86.png

diff --git a/src/site/resources/images/FR_plogo_org_FC_openDJ-302x86.png b/src/site/resources/images/FR_plogo_org_FC_openDJ-302x86.png
new file mode 100644
index 0000000000000000000000000000000000000000..28901172328b2ef71211020a663e85951f9b909e
GIT binary patch
literal 22823
zcmZs?19T=qw=Vp~wr$&)*tTsuZ){C4v2ELSCKKDXHL>;2ch0%@{_3^5yK48d@$6dF
ztGd^&UrGv+2(Y-Y0000%T1rd>003e9*VcfB{C9Ph@X`Hu194H26amyuk(pEgmYA5B4`^n=qar5p
zKkEN_{G?W{u1-8mOdcK{j2>)^jzCK$mLETUFfp?-v9dD!Lom2_Ik*~oGB~)9{kM_-
zWk<~1#T01mQ!O#wLz#uKc8=|8exckN=6&-syika&Y+{R{!`hc^W%0u`n_-
z{r@SsT3h^|@ctiK|9SG?YX8ORzn$^@OAU`G(A?P75vbk@
zH;vdeW{H+1uH~N9*1j#(RrWqs8GfE?wsJrl&*vne7IDS8V;VMd8)oYHnSPcNj}jU|
zJ(0wk5@2f$r1v*IH8I#W@89y)Gi2qZPJL>=-m&hipgluuJg=ZvpS#JsWO33s;9CUP
zy5EhtDMB)2q>A{~0c)I$(wvCvt!mjfw$SX}GK&05FR7}tcFkFF<{Gc7e;WhFO3=
z!ILRCj$FYuiieMGihOLuP6Lmsh#q_=$U9HSVtQYX_~a$08CpkL?jwjS`tVKL);}^-
z*(A<84&T@obYaQ1GwO2|DuPsnOHGr`%+?i{xrK7CUx$#q9OHC0tXc@Re+dFop<94C
zUMQWJSOKy}AD-<^XDeKK-X0ot(x6ciL;&t
z^yN9iq>x0k`Rq(yd%g)OD13(&(07dfON_sLe;&o}yizO1n*0ZR3eFa$zAtm@tTws5
zi~7otj(;Nwl=e;AWj~qA2&^CmPmQv*njen+rMS4`1qrS`L)h*7L;oop#z+K`DoDdd
zqt5%Azh|jwI`rb&ZQ-v~mRGLkO||c`kxs50Uw`yBCHYI0;saZEMW1rXYhd;Xh^t!s
zAK;LD=a?8rUXm{pH%;DD-p+B%+tH->LRy={{|`p
zo$)9A)T~f5QJ06TaC#)q3TpK&Y;tMqD)vz
zZo9K&+U++biK(b`uP^eJZDp7MT(#XwBhWq?&%pRpU=Rl|3m%;ZT0Io4i~X)BDZ~F$
zeSCH97-U=161-`cpyxkj^&M4`R^v@<8vbU8a6EhLvQ=b3hDN0TpP7{<+PbEYSbrN1)=lK47jrG$X!C396!UcD*L$Y^AmwC|i?BougM1Ed
z)uD7Y{mvS1=+BVc-+|X`o>@rB7;sb3SLCW=FwhWaus^QZEqJh|^ti7y{Y__mSC5MV
zWQdq^C~}X7wJ)VL$B%dzU$US7OfZ&Q|5A`H4w|8_E(yc^q#GojVqAkANlCqNLp$2oItFH1g}+D`|faDs@Fty57CQ
zmH7#Gd^#q+I*pK`p{s?}-wyyTF9hmf#ZSNB@%IB!Y!+&5_ffKq@3N
zh_{`|>#;aQ6U=R~8fIwIYyC(&cRWWzBg(?QvQ$$;h^dqAG3UJIxioWSyjgb;KBeO_ss?D-_B=cg=>
z%cigTu~1D@DuDOOH*sRH-F(r<`3cR7)1B0;90qxb
zKtw#fH~Zr{bwcCo-=sKotgYtxJt6b5auCSVo{>;)l{k6|mspQ_nkh-DB_~?XU1Pl0
zOaakXZ?$%KjFnY$9FPIhqq$3a^?(3ZD*xnnaZz!8*c&Kn=O4H{{v_-}IvayC7X;4%>YwA|%UuaF3X3{7xPqqxwC)B>I$TEAKdr_K>?J^qkTTlQRMUMBQ
z`)}UaYV({G$KfmhI+_5rI*{^Y^oh}+sb@ad*dgD2yhpe)tjyzTt1wI&D!SbzxIwzM
z?<4N~ZKfXGz&nE+ve3+<8u&}Pb1b=clZEaSuCc#B#buuqRk96`w1$#;*2z$YD&x5a
z)dUL%bSrBaiQw8|`cey+8g$mQFXwotUeAkei~uzYx9W2OjxTCnmjq>4T(P-N0{8~!
z3aI!slVg&wj!2?y*jphBuk+_3GX_7>AOM~8%&MXQT578
zw1unJd$##zs1rl3BWj@wNFm!ktH1Q|_Zhr+rp8Pser&qtc|I5BBvvq5%?MN~-Hu!s
zYWut>pe0ogDRJ}KJkL+zIsLp`Pz0n}uFksiIl4x*aqQfPob;83?4MH7`bn8oZcJ5)
z6+dC2+%cf`GbDqyJGP)mC;4k}135yJh;XC*lkGQC8Gq9CZ8tNE^_KYsc4N;N~MC?U|*YIEXIT386i0e`v3U=(H(Q(2`v13F5
zY)7MrV$pFVU$&dW*W5wt17TjJ4JQ2qd>xea|!>T!Q2
zk=i?6VGYI7-z2c=hB|XvFhRCY3&$1bK|UtfFzd5u-0oQM=R0-4(%(b`itV;e1d~%A
z(M|ZxIgh5U_~ZICIx1Zik}xL4*~2Aj?GNhqC}Uj&ZJR!p*g30RtBHhy@lJsRhHMcN
zP)~8)c$K8hKx&+G-LdGdDOESECcDlmQgl$Z02LM01Xas6=e|-46%Uo_tT66m5n@!Q
z)z+GsOE0$3_Z1AtyZ1V2>dI_q*zU!(Ys2pqHij_K!@kRTj{G{&o82vq%|%e8ef=2|
zUg)c`1WgzfKXIKzR`2*Fc;vHBOb$vAc9uV0@70%0ygaBrQ@X#8e)Mm1NX*wG_#<&#
zuEnCs3Fon45T64>(Nz1}to3FfQY{L#zU5kroJ=i!o-EV9`9yUQ0S(}lS;ar0_ph)6
ze`ufvk;iE-oc05I)pocaXWIp@;zVo24QIYU3oT1U>M=;vfz?d^#<#MIUmTKD
z-5;1Gx~w(PyxZdC?uQ;1JkzwhxYa$`^x6T8wU&L)JSeNvTpJx{)`^aN5p^4mOzyYP
z$5Kp1dLyHc8g+@c8r;t{v(%${r};ahzFkcG^7)l9FzVpKwZ@OQi60!yzA+{7@S%0E
z$TNFUv_34#9KgU2RNI)7nYTA+{>gRzG`%P~
zAprp{pl@*71Rgom@4L{M#n;S`kptf+FD&p?p+BDYN%r~Ruo2O%&xt{4E|!!kv5eP*UdVvWsQz&10YySL&mq$YOADa5ag{jJ1iNKjpT)b
zJ{0*=;Uz;~-p-%0@})88_0Qzd`45Yn|GqQ@tf>`haMy?6Bde@RaL+cw*UzChja%r%?j~gvH9VnF%;5FX?-qm)wCa=>^10;RT=ePQs0Y8_55HxiQ=;k2xrkd+-nmHs
z+TZz*_sfa=`9qUepi3{1a>V#)OoqP(yRd4SX9SI_=b!CF~3$C~z3UC2H{
zlDLLj^|lk*TB!S|buz*N3RxV2lPO^r1QQJt>k5@x>mRD!kH3X3_(vJPa8Tdu#7~S1
z;49HXbps?GUCFupyy|*NR3qQ66~tgKm-w=wMKOr8NwY-KQXqT~24iKdXQWF}P5Dee
z`@d`_+*$ndCv*ix=51(7mnWo@eS5olg;vb8*Hzc#?=?Ol4;HTX`S(FVurU6#dhduZ
z)icen{D^KDw3|?1N>woFJZMb0>+(XiN#Jim7y*CwWxzEX^k`xek5ZL)
z(fGp07`=zaHdHL#^ssFeqekjByN?)wA#XLN2V{$O?wpv~b-A}Ja_m+V%KUg=w>G_R
z^$RNoqgtnEBP>XcV%n3$w_q1IV2}d9NLocO{CH{k3}NI1%aqnUL%8+MGoD08;#ab=nF^6OWtTO9{A@p8_!+hIp1Qg7DB
z+{Ea&TJhhA60`(e_!8F(3&@t=xtCUTQl3nPyGiSsvEFPlUJtEt2cWN{f_T+NEjLrt
z+e6`uS8Zv%2W}zXRj9@I(udM!(
zU%hr7F-wfRliI(B>hFV^bzf>6e$(GfGRp}*kLJV1oSaq|zrNpH{k=|T+y-%~Falo5
zn?sIR@TwbJSe7E2NUWf6KOL0}&p9gjM;4=u2U-l@jBB%f+=2y*ndp(;JdqXHRDa>~
zdA>v(opNW(=Mr>Z>V&$n79#AZ(=zNgotr5I3eh~FP*cT{WSF#x#h#$2saMa9xiSaU
zTpZZ#;J`SdB1VEqu;~G{ax`{po^u}7&F@otsEJQZ8rma!=fo4QOr2SjZD7D=wP{B5v`34CydA=7@Otm&PVGup;ImPl*EH&K=X;o39}1+W7Gh0xz9FSCCMd
z^6}pF`C2qWjLAI!1Pd^X9bbvAw#Fg8;XQsakAGmg-J!WTf*|5h>K9?0tU(Y8UaJVq
zgl9E_?ms1gxNn&@XwYu@S0=!|-(V>Ap!-oi)<0cBts~DpYaer~5m0@IWdDiCy3q
zSm&qhlOiO5gQrb9KivGch~gtB{iQh*@xX*Oui$NGC(+ehNLH|z%7mW`cR7WwF
z*FfFhXjKvxg^JYzr+Fstxa~2M&S{zr>rFc!lj1@x5f02H0aPUA>h&
z`|{d67EH_dxxDe^AFv-8KqF-{OPBZPFRXFn8#c!4Z!=}C*CR1Z72#*cpwVMlA+Bkd
zpQWpl#k*yWDze3X@U8S71#XYFedd?iXz7f9=p0WDR)(viED@s6d9_p)d8}Q#c}q@z
z3Z~!pQF9Ca92@#N=L3Ex9hs5xw6=O3`gXV8DLQ!YCl`337v#_jw>ACT`c+V;Na#>W
zIW{KsE6S?}2k`Da_}j&hu0K*jjiWFJj=4|`_qR!Bkg9aAqF+D?#cdK=g&0Qj8;Uvs
zK3ZC+!KOGW-NzxES8JWe@do_Xr7^_eVbGIQ^6#`=%&V?{?}ks2K@NmLh|W?(a(M)D
zW~iFr6}gKrio|KBB@hfQdIb?*O`LNqg-`gv#{g^@#i3N|Jdpvo*$Y>pw3i%?kJwYr
zk7-OE=FovDbAcHbxR7(@v&utBZngrP%oAF_x$5SF?x$AU`;;l0q^Eh=tQEHY>cU+1
z(NPj%?GQq+^hn?OycvQDCLeDj-NpcHh%GK$eeoVjj%b7BBCZ+j*F@OaN3~e~9;uB}
z+c&j)S#L+-
z=3s?@&cJX5)qEG%{t>>uBz2Aon^r5eg^ty-f#qfL*cVm3c?VYYq)M3;jiuSW&x{UwS$X?A2*pQ3Z2C0W9i4GwF|D<7w`YBK~)`ni&LsX;H_wip}1^D|J>
z&Zz>ZB6-2%1|13_m&Dm_bHvWScz@sL|CK%{5n~ul7GJe@@inV&gb`D8VTY%nsks#9
z8nqMlH~Cb7QXL6khrnDJOYiM6TXQz&FIRyH*f&&p+gHp^^S@RX26MMa91p*WTlxLq
z$YH*sD6Rhq0p-`a9}Ro?XYWm=@MM05pRxVa2(e@gK8mOLK^K%kKyo=vyO`$J4IyrZg^aHCL?>dnHxU$mm`^TE9vb6yu5HNV?>TQNpWxa3dby?&9`)|}#Kgd`_wtuXuS*;N^#kuM^r(a0L(haA{;
zc;FM*f#z#K+*sSBCh6MD%gjMgS@7P;aZVi
z?|Agau0(sN5Q1PvM6XXdi*=n2kLbjj)?M}~#Rf1p`G>OF9qON@Jegjc2+s$RbP^(=
zM~7{LqZaAFshAl^&K0+R3(xbP1`p%pO-@d2hDQqXh$YzQr1U;uVza;{#%cp3?u1K*
z1Hrh4X$1lkWxBQ66CTQ-sWS}PT&QIcs;p`ieg!@C4ZQUwj_q{x!sl_R9|$?KxMTuN~?95P0EQS_Ij1owRtN#_A8QW%~DPH&m4u`BHL9@Jf@cZvcdNC
z>Ah5Ys*fnKK!HY?Dd%&gb!o3w%7CoCJ7*^uSaVOY`5S7^niI1Ft9t^flXZFM7QOgb
zdVdI;+W@F>slGA0bk3!&%C9B4n7O
zn<57Th)BVTAU;xKLv4%-u(?X?s1m@F1wYr@P&q%y!oBd#6-9sNjw^BAjum_K?w4j7
zgA1A{&kn@O#)|L3Q*5RCC=TfRw0Vq@_2K5%CT_RLTQUs}o*1|L3-A30-P0MH5XuZ#
z7yuzOAxz5)!u+c78H}^Qde0h=fUb%;rBz*?S0Mszfqb-{@Mc-bdFG{AY@4V$yHU=U
zQ&Fjguy9MfvHYsK&J#h1ChmRMK=z+u*7zIAu
zQ(Y|k@^uz=Q7YJec!%+vJswGMeeL$fh+}LUJ!^A4`JMg+ZC>P8)CHUJ;8zfw%OYfZ
z?_TdX$y*VD?J8&f=Q->g)`}*t*XlB{MfL&AjViI7y3A`^hRYCZgq_Tt@~h>xfr`$A9jq95-{m%y2wUwI*6DRgG9ax7DlLuUv=Jy
z<$Nzi$M}Lq{|>`3Dn@AH?vIZY(dDT|{C;=>fKgV1D$aa7y;y*+_J^~|GKyCzYfHH6TkGpSy=HH8tQ5QJQ#+~Cd8a)PeZS}A>QH&E1Z7h_3X
zjpC_lQcymuv=&)?FC*YnJ+SnU@C$
zFO@%-)fPZ22VP5BL>lvmHkz>`$t%j+KAEj{w;+*D~tybB<%(xOw-x%Y>
z1Y<)#jy-&n%h_ndiedGv_(lKhZ&>7`1?$eDWl0Gu|O>1{ECq-K+_D$$ctmth1eMu7`T%mT^T(Y&s8OfI$}4_3}PC?Lu?>Hs+nvz
zG>%mOW=7X&ipm+McfEK4X$$ki!2asuXX^0;QMTLGVw~s>uz1Q8z%oZy$D*U|llE_^
z!tTG*LO8h0cpgGJ!21+B&Sh^svd#Eid;E{F
z=Kz8J;EG+g29qPgx&3;{9aEO197at8MZ38-?K7~teYCC1{Es;9QohQMhhG>OLLtVg
zLdA7T2P_mn1%2s~;A6(i4KHE5F@(ls)5yq3mbWsM27RB7y{aZj!%{C=VyH4Pac+gY
z{zzm}UMM|0fq?Lu{N=>m!!xv7f$7
zcj|S%!ro4)>LkO#b!4~t#STW7waR(D3NU5TZ(}HJu+LjZG3H3=-Ptv_@LAZ0f^RKr
zyFPR*i<`-)pd>#4g=8dm=(2r{<7=_a8v@=ORWsBu;gkToonJqhUMJr9DEkQ3
z6ROK-_(+9G{e?HH6PC+5ke{FA4BkxEZMWwq)+5_r{qWkR+2V%~VWXSf-U4xCo~3OK
zCrn}{6%g<^Uy9h2zF@ex^_uk&W*@tw{J(XJN?oAaQav0aLI7H(>&
zb!ZthI;Wuv%~M=n#TTlX+^rE=NlP}H4lr)XcB89mJg3CCh06W!7Kn_wivlrT~
zbwYM5+gt=hb(5_jeeyEu03)q%jaJs3`0NP@0T5CKoC1SKFw5@^IaRq-{DBhAG~!dx
z{DFTuB{2e7Qed`}i}d8ZpH8%myEO^*VG0Euhp{#UPE2D?md`BEI~S9Ls7onEAr=6Y
z2l2IXY7gc*5O$Jt&xZ3uG_~5J)S7EVCtARmp4oGag-wh$7M{&fHO-=*dI+LT#p6wo{L=cj{KX8f5uideD&U2_Nf9J${8
zIY9s;IT6K`{%n$84-`FE-p#L4I=TQ*uy;{jpM^aOp9lJe^+Z?5Kq5^@VYo^RfZeSYulPlrD-?L_+%gX8Sb$m7{c<+WZ5|QwfgoHttN_z
ze5B)7;1Y1#r>SwLpqoy(aeKyTK*2gs)Z#X2zEYEBriX<+PVDH_BV_hTi&;)_%~37m
z2^Vuan$Xj3d!Z3Q0!Q6JyON0sWGPX>98Kv%+0Rh)Z$y2
zxf%j$U+zysMewWaI
z6ePL;?xs_mV9}#0OfdU;_05*&=DnWCW%d!AI{8O8`3q96VVwRi#(LN#_S
zIZQC<>}x`6W2nNP3qxvHKoXDJmv^Zg*!-<{#WT>Dr0%IfM;>d<#q$a);0|q
zWWFp@Obfqc|6`X_8#Yi=u`|3r_90QjW$B8LVDE$wv1n=FIrXn2{HX_D&N_D|EpPSK
zS6M#u)=f%VK<2n)SkCTVZLbx)>*R9YXLQ#gx%nW|Uvz{tuE@)UDU%
zV_$ws=PJa<{;jEgv9*29^X;WkS>HIAlZ_WjT4YmN=FV2q_uiY2d>}p7Kl@gTNXDR%`L2=qxm4B2ex7O83BxkMAD@K>
zJ!+Ynp%~ieZC+%3@7si5GEvB>$wlhwHJ|ka?H3i1Wesah#3lg8sO@Yx&&y|-#Kt(;(Kg}?JK@#J}WhL|yS9PRO8BlG+SG3T}L&ESk5oq8suJkFbTgjCR{}h;Kz6a2gazd&zqoEzf8PAJjgA!C>oZiPuZiuU%LE6s=YaGB!
zrZi^D2Hl6^uVwzIAk4UeLI|u(FrpZEt4HA)1h9C;mK#&rL4aYp<51_
zGa*Met|rYUX;+k7Dd#ogwyHwZcp5|qd@jPo*8K?ZHq}dKr;D!V3j*Qg6|C3-A~?Tw
zhZn?lt`WvnEslObvR^IjP{x!4v8wbz>1@4{(;KONz%{xMkt0Sq
zv*X94Cj`ECcD8siRq7ZKdNC`cV@EMq0)Yqhl)1WXuq`H8)Y5xu4X^CK{5`FZx6lGOClDtV2_@eq9n<84z!yd}o+$E!aVx}8oA<=Fimg>h
z2eJ-)1=5NPwBy1=4Mu(Le9lRPCh9?vK^%CUJZ3W8@?@^ht_iq}?;9&D#DzD_v*%Jn
z>_Hpehr2Gnhk+hZxQGp#9hecYXzR09G>q!|8GNyOYJ&Hgh?jD)A3A|CFXV5KTxkJZ
zG}|yChZ5K@45|haen~9kiU@v5Y!(KDFJnBNQ__3mnU$zXd_2g^pJ|!NR35Cxr(uV;
z_WHl3Z1o7bV3CP%1mU{OK5S2G8I-+rJx^%
zRLV$FfE(4*{AX^5F%0MvXqmXDYw=LY5AYSeg95q5j=T)cVG`Mq0S{g&pb{Ic^i{En
zaCtJ&KZsX&tMjweb@bo~u2;V}98!2;p*H5hQo(dkt+m}tJ64yk(K=$^Q|=U`T1!Jh
z7azacs!~9q8k5oX{b9L3si
zZX}2I5Q4E))U4*Yxc7VHpC;hJW71^bqNzrF%hfNmQmu$cAzPYQYC}n%G*+?Sl0P6A
zXE`_RBx5mAd>zj${p*)rNK`vNp%#MK8)xzacQkgAwlr4--~4~Ls5u=7oDZK!b4kCsWG;cTl#3bjR{}Uwl{trpKkF=4i!V&~mprX(RxUcP(q=x%fzfb5HGO0DwLDY8
zwXXH?pa`1XYNzN^BiqG$W94VY<#j}BJF&dtdWd*e$4mGC>dnbMpGoYd&W%O{7p6-AcIcO8*hIcN<4o3)!DR3)>m1xqc*L%U{fq
zuZvQTD?nxllKG@19nDUp>eU>p$&BMGpwPTHo-wxOVqqJvysLVy^u_~jXfU!FrWwI@
z>*RG;MU~_(`|-xuxqKBF;^3jI4VjAIrUZ_5uEFV{k9N9@8U+Yqx0nCT2@}6dz=lgh
zlFdaZBikN9>5M{XEa_r{j)RSS)^+bV!7)SYg37h6eW~!}al3gmENf56L)DCpP@m48
z0l{Q7>wtorM|}mV1_T2K5I{8&gxqd{$v@pe#b^}efv}z(4i^pZaogl=aVr()Phd6m
zYt$P6rwq6j2%0Mv8=FMo#?*DF;yE0?j#T_&D8yrHb|
z;@r0KpG>>!pXetbBydMF;kF7K!g_`@r$&g0_H`SWjgzjj*t2I>2Eyj$(CTmNi5F)DwCkkvqxQPiGG>m87_L9ts7L
zs@|Y1S29C+-gEwdLw9gP!xhu(a(Yl9!RDKviz+@>+gHqT23_4ZJin8oX;2|yGGyXk
z5br%8kC|(h;z_?edkl^RuV`Do(3UujBp$Gc7?$Y2@O#wJ@;+kWEJW7lvZ(yBSy0dl
zEhPbG+MNv(lD4V~nR4fv;As^Gf7}aP<>BJT$i3ifaUQr4LHX3l-G?ySN??tGAhH04
z(^k%JvwiF7u3ioHjFdm8_4;$tO5TM#xn5g~U12*JLH<`$f
z%KV$=>DqtQTWy)OTCbkn$n|7q&(8{CMG3_ETu4@Hj+}171%;3k!?N$1&R%K?evWfQ
zzwPrnugvw(b`+<&W8R!WI)jsdhlIyH>A%=*m#^d0(X~>MrWp$@~BD?MMWl07qBBtex@2Bu3jiMv-DVENUQxoBVPvw*z2QH2JY`H
zndtc)tQB!9Uq_+u;`f`dmxYRg-9>|gji#NGX0BO9g{`cuk5%~pGG*cW0?l=1>fW0_
zu6DC-_oJq~f)tY7`SJS6$7ngxnOBdn{!n$Yn-uVS27}Y9^|8B{Hq>M=amOX%BQpZ^
z_s|SAb@*q8)Z|ptbmu(b)~cb~Jdxohb_r)xUfu+f_t!zmj<$0nqmr^-)PRR9
zQN!tQBEv#G7|euZi62MMRuhHq=AO@X@Or7Z8Ku!OFS`tqJJDM+Km~A2%wcCOU!@bb
z8JPLOUYdGj+6k2$j{|ORztNDptmxlLueMaa^Y@OyFht4N(n>v6+y}nak!V_N1f55x
zL*Dt%>{_Sq05E*GNfJeJzNWoSYofXLxx4H9RDC0>kMg9iVPa>-kdgNyWf(TBk;|1q69a(Gu#6lM^Y7n
z>H=Xa0t;xsGs!jQNZEfuQQDVtS(6aRn->B#MGu-Uw56=lTa4ZoGvG?6%_(mPAR8S`
z!dP;F6?v&EkW;PXWSRWAqiy^vB`ntC<*}ki22p}$>k^;RL1)g8@a0(FP8&e;M6j_`t!E=*8){qU$*
z^#UPHtbC$5Bn?IE#7s=0h3B-r2bb8KXd_rHux$}no?AAcoL@4~=aZ?dPh)r)QT@&`
zvKCyDK1!26E-ETYdA9}xym$wMfF%S{f`5AMu)UhiZ{u^idbr|R(}sar
zhzDUILj;^LoVaJ*P-&%EeuUWXs0hn~G5Z#T58sz5Lm`J|7PUN5V2;Kcr)F8`YKRsJ
zV-HZz3$HWIRLPt*eGO&+u$X;l2wgD1l4fimx+h?48ZYxT5h@+q6cd25Roibpem*S^
zRNOG2C&>CmcU`s>yv-F7VIbqRV%q?V%+vzK19I_pYfl-N|T=Y^*fd8n6YfIG-4edZ-MzyVu+;`?sHASqZR8*gUEGA*^qF_w+F>7@Yf@
z1;UPMw9oCQ=cW`nBPZONFJX-oI0vo`a&$a~V)tAz5
zJu;5e55{l0S2z?hKV_j@{Jmsf{`EPGOK#6JR8&9bj0yTWnzHe73G_5YBWPkKvd<)S
z&PMeES*!7phz~d_UALsW3+eTFzfc~0*mGPSoaQ>?8ye>I43y-sL+ehFPQwaA?njZK
z31)1e5b`Un%j>$@$mXiaTO*Y|r*)r-n++WGI19Im_?hEId@;He5iWkgyIZ!wZdRGD
zz6T5rL|y|&XV`Cl&09IY-xjknq!rEc?zL8#O?Rw6N{gqX9om^%k!P~$D)c#^0Xx&J
zmP=p%ijwLc9~~a#R!uNl<9nlvt;uD0T0u^b(cTm#7-E1@eW7MR$4d7<*N=(TlUqBb
zAXu6>ZbqVmZVMM6l_ku3$UH%3=-pt2KpkgRmh5DvXVB}1jF<(-$Ka1~^ZQIgHOb^F
zY09El;qYCV)3yQJkkv6UbUiVq=nR;ZfE
z(-DoM0Lzqj%?EL517h_6h|>pL?oG4ID^GDg=tsSBE-d#o08m>a?aj5#-qE3MuAvP<
z-)MEsz}6&hnWbD%5C^iWw|T4&Lrhc<6qLWDEZwG1OV$VJ{OrP`FNL7^am8St!WBE1
zV7yacfT^OWdFcC;$7))P1JfPm^2rl9FWN?V|GnVr>|z_0dRP!*;>0bS
zLz@V6QaL$`SHn{N%iSA*APGEK!0{i|`>fU2cvod(^zcCErfjI>q)+e!%enfTG!Pu+
z`}CYz;8-y?p+1INDtVFXSDV`T2B!~bJd2z)klhvD?s31_9yjPFau?(PC2)A-Vn>{~
zecu){C<3A1985Po9$_ui+e&EKQS5MZ=e^%aQ&IIjP?f7JWAaAyn}#F%_J>tj7KfK0
z+5;?^E#4w*onq_1^kk%z%cf20mrU)s9}={bkw-m~!ps8nj7oYFFD`xMD|tSR&y})H
zL~np-H0QV9OBP8~hO^u)4WEE(stl_QwSZ>2qO}zTyewI8qWV_X=|35xG?@xQKJB_7
zJVil=G^rngy><@wF1-3gL-Xpr$xi(M3@3A)Dhmi#R{&if%+?~;kG%J{jg!q@h1;Tm
zYW!K&F*x#v>BuoUPEvWMQ@femX!8N9Sf(WVR1K7Ho^qsO@csv2>{8c(gLyfBcMoV9
zY59GH>FsTrLGQT-QP*BK5*xxhD}XhJVneJrz}Ov`nPGQRfjJlD*;DNI0g8eJQqyMN
zu1&}^=0}Ejie<3cjfm~?hS8SekyIBoL_%+m_n-3zDK3hr&yb8`0+}wsptH5C3~G6?
zJ~oX%vU`#Ov~tiiz6FVs$7jBh4nM5EhA7hNd^0yB_EA3HdR2vOC~CxYG?o&7RQU%!
z{DA83gveJAmNnor0`o}Jf4v46ZKu}B2t<%v)-jWHA&LGR`JAd~k=NujC(~w|wQ`>Q
zg1S0rJ&6+<3m~m6*%4j8!wVyb)0Rh_vQQg@7fD>E`{?~?eT~$vvybr|*}c%S4Z3Si
zUROFMpOqf$FOr{9EA1D--Y}31IJuXWUy#oA-O8Z~A}{J0ep|5~5sv5dd%{!(?Q
zd1&lcDnPL4if`1_xZ1icgT#%H+ZV*+p~gj+SZ-AS#212FcTrs6v|vC`#B7{mjPW=B
zdnLnm!__LgZ+IS-VK?CM2m+yx248!MMs7TZ#sl0LOg|geJ*jS=`IFBEA~b)GdBNJb
z^G$*4lVS0H1sxdT=l&eM=$BD7T*o0CDf+1#erf7BRP|$MrM+5g0{^X-D99pT?cZf^
zE%XUoQN(cC$g=y*_HEB#`P$It?en`rq423xP4W;a>iJGPW?T)IOtmG&)sz8A>{OO^
zPu0`}?rz{%(pQJs?v~)K*2bA{o7!$PN6dfLSWi|1a{IuP;Y`fN!ilj|1b84T1bNe>
zQ%Io~R+5=JOA3lAY7M-*hUMLxH9}C0*mu#jOFEp&vBLpkL<0phBMj2#GM0B;K
z=O`M9bWb_I)0b$jZ4__e_gkR1jWVybMs~^=^c8!dPIVRl2BWOb!oHMqe+Gd4BtdFf
z0RYsPsrjJ}w@8MgX6`SJ6U@EkvQ@tn{W~DBn8g-&;kb-3WB>pb=}AOERAlC4Ucw6h
zLaRO3M%vQ=R;|)#J5wIeQp2x>p0iM%o<&XmGwJ#-uNnEo1{CX?<=+byVARt&2H)3M
z@>{apt|mS^@%?zpE-;nvt%O!|vu(M@umZe@-3q@I?a)vb;KB+cM#FHjG$Fc#KL-0R
zHPS78ewH&V=q-KpKD9b1K`CvU@{zE)(Um@aNy$w>N^p$gTP8BBp#QT_aPC4OyvnT^
zcCYCRM3Tg0%yuG4dZ2V_@Q)-luW9beMvQ1jqv`qrZ74;XRi9LU6hVW>g|G&kbZy$s
zwq_q;N%oV=E=OXgECMZ+p#Y$-uSV`DZgTa<|p9dd6?~wWZ6AI
zN6=i>bOzHA83|xAof)%9$Jrl#^Py&7ekj>0^{CY5K6mvDI~FbDqc;=k>LaFzL9RNw
zq%S1DSIBRLYx&>Maq>Jfm2{_dr%w+lr|IdHvVy4*@Y8Hpxb*I9)7(`{Smu8Q(2^0|
z+et)~D4KJC7V?=b8?stD@sWH#(v&r7ek#98uf`?`3jjo>v$V3s`ejj5
zkm1_npdEkqs;iiA{R)2zXv6xE@nE>Im-q&3WpaT&;!ecxFD|+4_9sL;?Wb%#Bizxd
zw%UPV8?Q$MSZLq|KTscJXR=V6(bt65&ilzpK&}?4x{K-T=asS^cS$Rfs!ZF5zXq^$
z?xO~DC9@i5tb+LIRODH#d~rwv*6MlROy6h)It-K*1)hdjqQaDZlyn?S!{J9*d13Jd
z0%ne@(M6pdiC~?bD||a}f@Mu}?szbMxh`6niz++5J*d|)uXYGTP0*qRI-Yars2`*C
z&PMNbn1Dz6H^57l>KYm1vI=xf;0C3jjHaCO4$4Fr(c6GAfR$~}{|at>qwS!=_hQk0
zhe0dK6DqV())*K!Wt#A$YF)$1?61)Y;w{rUhXz;+&D5Kr9T+n*hiH#S(>SHLb4zyA
zU}TJZWzCP?L;KWz#~a^hJ)m%B^W>G9N(>0JSX5yTOfXFP%D~HEPJ#QxT%m@2dWL^>
zq}Re{Farpbt}^+BY7^zjbSw5OyIofB%&w}ks*`Mb$Ih`zKw@fHHQHYgNBfHhW6juR
zuHkn{wb}u~>_w}C&(c2rN|inkxQY8y>D=EIUxcA(9O!9v>?q+FH?8gu+5p}ayjC?b
zaQ~Ts`*XD0_a-?sDr)yCoxr@Dl7%*Y{nxVA@Sy);l9_7fu6h-UMc91E!WkW!4``7;sz_
z2QmqqRLD3$l>DSaAr+=62+Q~8JIZiP6F2bzr0kzD#rf&ddCQ9{RO-}P0i$3>gp3m$
z%4-IY#Du_GjFBh#T+OD^Z=>INKLnh`?-P->hEsN?mPjUA7gV{UK>3U-W0lbWF$*1Z
z&NV!4VW9th&UJpd{L&R$6uqQuMZk=b*^x_7D)uj#yYhZ`_J`+2Ke>c~XEH>-3o4JI
z<4Wo((%mcVl#Atw0NS79z27pf{m@ILei6I*CT#;YT#JpZH=<*gJV@H@)cfPPwydV3
zTROIO;$+T#8l>;gyYYF5y`{4w_wge8Qpc7K)uVVGv~TVhO%r?}PD@+FG8s<289&-o
zqFsx3;6kvb_0_hC#CZwxK^ga|{hH_Td-1ieXK@@|#UwUjBTiWzq_lnuP4{>TY4?RgxBhdTOjt_a7r$F@?Zn43<|&!dr-Spo6uiv9ef6Y=bLqrK0Mv77
zKW}68I}MEq0j;ERwH;l%2leq{UuV!$ds94SADg{G{wKC?e{1RGEAP>JBw_2ki|*}+
z6m~pl&KWv2+Xh0D@L5%zO&$v^ZzkI}^5jUahe4@M2TqGfeMGzI&!T{`F_M@M1?uDh
z3TgWp3eHr+ewZz&e`E{!W3rfysZ~YAqHug~XRh%)UTLsZ>fT-V9b^2vSI
z!JA)uHu)O+7Cq2*r&ub|d$X^eG_sI(kEI!(NKJ6UkbMZ{*^eYfQ4Y4lm}yBH<$ZbCLNa;^f$Y!7mVfOy$p1$vA0pZnUu-HnXcf7}btWWyG;G*zurXXM
zI`5BSfn%nT6ri@#&wUgBfm?5qC0SzRWk!z>i{lx2tY$z
zR=ubEdTKZ*!)vSEU_>^NXSxGg6L64|O?n-zTMo1~_wdkD-?$$8W
zFh{)A8ktB`56fAFwDQyevYemY+1?hk9hE(5b6oyXdU^uH(&znrS6ke!ftI|}-}92F
zL-uvI(h#?Oo&FSo)u8r)fpCq!YIh&F^}ax?+AAD@0Cf-SfrHUabE|Jb4)t$
z*lca!G=UfWZ17ULy?x!{%n#d(`IENsUed=Zs48O6f*P)vI@ldg6*kl(OJBg%UE&fw
z-8-&2yL@TyNZE&qZ)H_%1YkQlY7a8)Mwek+25A{yoU{J~gt=Xr}KQ+tVWi#jH|~%zZH9`NZvEJUY2Q5@tK?ebKqMuFU~6Vy>g#>>cLCMp=E+Xn-k5=u
z-Ot@(#)JFCD1wWfHB4KhshKXB5w%->>cF~%8g4sRvE8EX=|6ia`!CIrBUm2PdD!C=)%r=y6#`~2h6%JH5Ft{ApbvmxWrF)mAHdITmyR;CM%=SzU
zgi7pQn^<(#;x0?pzUL}9d5?P4b?H8<n6nZzGR0q>%#9uk0+fL9SfW-Xd_hTjg4
zC9yD=O){>vAjl&xh43Pp@UTlkMzSOMksy)35n9%Z*7G?}fzv=PV9)%2B&@1YMC9l!
zZ!0w1$9Bf0I2|~gGc0D16g&O`YzpxTvWOQK@X^6%WJcO)-up!bxWv&)sBmBxazNe=
zkZ%k~0ZebG9#Q>aJR=wnrfjyR&&sm``&#k2g&U`fa_zOZ)i14|onfPSL*vxC>XFrF
z;|tHy8Hw7&ECEGF#L7_te(Em5>+qMF=B@mi@e;w)nG2_%j(@2eIe_JGiC=gwF{M@d
zfW@2f4l)Jjn4iJVT$8}d07M8w`YW$^#}6A_dlpUy40Av+w94^i
z97IR;@G5KLx=pWV&*Bo@hwggPy$XMG2kITU`4$84`eJdo%9~m@wc%CQex-I~^+!ab
z?i-(Pq$U4ji6k({RfooG+0g24%Pr2ea@~#triE>Hw{oMxfkEH^r-sQ7nn0nDwH`;B
zSQAQ7_82hZIDDm50|e(4Hh1Cz-MSv3qg@>u|5qHNRCtU|&XHZbg;!cW#{w9`+P8Lo
zuAy9X21s?*Ejd+%A%Z{WR
z53jddU(&(A2!z){!x*KL&w8&C@6V*q;Stu!_!=9*7XF`+;fo!c+Ybh++7QMxojo3)
z+6NE4ZTU{?5j>J?#tF^{-uYeGN;#5u!0}JM~d&|Ci>714Cf%f+vviY^|MRGem7?rMD
zI(OA4_8-2#+!5Z$?|pWV|4`e3g+&#KOSM}G6%Ons4mhBK+%glGeaWqpWyOBy
zI9cl+ygtq4`4~iEvvAv>igEjd|0=nJX>V9C^>-w59_QH5*KPOwub)2#
zS?NSguQ*l=r-Z>*BvC1kDE#Jv#>rm@3c+nv!_tR=a>sSHwI0W_2Uc6Fi$V=~f`6na
zfW^z7-UY;MCAM@Nfo|<2c`(j;{tLYK
zB~GjQt9wSKylvsC2`^1-@9r;9Bo^yFcZp{xgNBFtcFsG0_3_tK^
zOLrtU%EW&b|LOaa>;!(O^FPiR4hArEc7kOcVcl@)4cUEy;NeX;@dJ?#BhF~o3JxXq
z1Chtq@J(*?5^Sc3l88P~a1uyK$Z#mzplc-O-u*A{%=Q9&a@iKsUV)zVsO?l~nrdBg
z{Uzx!ua3!=+J%w7RX@KzE$4}(TFrqKIzdeD+4%A_?zC0j=DE%C4qFNRaUg6~{l%(0
zuW(@C96)XXU&79bU~{?a79O#@-VBY-V{r@+btRwa!@
z#Y~asVJ`?Bm&P%|E7MnIZb2=-^r?}AM=HkL!SRiRrj!M?VIt{5HgpyDz_^3R}YaWLOD(a6o)B%!BF03hg6)Xtt42q(MkBvG4*@!=1Z5qpa`=U&vtWmYtEQJ1Xer8z}q*BnhSkZ>&ssEf%a)DaZ!{Imb!vJKQb=rz$<(Co4y%M1_F^6QCVC1?#0-FI!=z
zfbk;(vU4qKxclmpt=_1INdHLaJ`fkqUu31Tqiw7IaPyVT`T9jOPO<~<5IfiYQ|b0{
zshp%dt#~S^@A2297T$^eR)DJuJHj6Ty*Y`8Ut*%Pr=Y(6)bX>0PbE}1FgP5LxRpQw
zos(c61mD$}o!wK`R7%stC)Yh095!NHptD60nRMvi(xvlO{zUOH;%vn(YaZqkM{>m7
zml|%EdOlLqT258JJ=>8#qpBu#a4wra5dit_@KMPJ05qf{=S`fdG?p_JIK!}$)7G6u
z-Ug3zQ0-ee=jlYYyZx3UL=Fa+j*J!%HbCm1lpnu2-NK;~^(PnUiynL(-TM7(J5SVY;}mkoE3UTTNBD@AmWd=XJkn
z-m2dKFmpTGa?c4Md9I`L-tDH6XL22@)xKO?4*MwUa;Bp{O(ybF(^bh+QZ=bs+W+Yo
z#2(`$6D}uZE4igNU$*==`hq0HnZGP=5=iGzY_vX9Rg*pksqaIai}{fe`wo8(k3P`Z
zxpBOX!UNFeAtAo3#RJkE!xZ=QMA|(YbBb}bBWr|ClUYSQC^nic-U&#=q-GkT%@XDyl{(*_H>sP8xh@BR6lcRg+T86CSP1%E#8tz&w6t8Y8+
z$3)>q#YHLd*IZ}e4yK?RI3-&a>^=sfk9l5jNwTJOJ`#}W1LXa@Xy$Cq`*?m25><;n
z=(}3bxBYVK`mKLNnEa)aMVKTY8QvP${s))}FF{IsUdF3B^_*$!+V)KyO-yL6IArV5
zFRILnpANEF%J9&}e{MpHZ{J6@ZMr{tV|c#h{|EdRPcM_Y5~%
   org.forgerock.commons
   forgerock-community-skin
-  1.0.0
+  1.1.0-SNAPSHOT
  
  
  
@@ -79,7 +79,7 @@
   

 
   
-   
+   
    
    
   
@@ -116,7 +116,7 @@
   UA-23412190-8
   
    http://opendj.org/
-   ./images/opendj-tagline-179x65.png
+   ./images/FR_plogo_org_FC_openDJ-302x86.png
    OpenDJ
   
   forgerock.org

From ac7b08635ec52089076f688f27115c7159603d2b Mon Sep 17 00:00:00 2001
From: Mark Craig 
Date: Thu, 4 Feb 2016 16:47:29 +0100
Subject: [PATCH 040/125] OPENDJ-2618 Try to prevent broken breadcrumbs

---
 src/site/site.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 874f1af6f..9b7356f93 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -41,8 +41,8 @@
  
 
   
-   
-   
+   
+   
   
 
   

From 151278eaa0b63e360b238825ac5b925bf9aa5779 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Tue, 15 Dec 2015 11:58:40 +0100
Subject: [PATCH 041/125] OPENDJ-2550 RateTool: Improve error output

If for some reasons, all rate tool threads fail with the same error, we will have the same error printed n times on console.
This is fixed by adding synchronization mechanism with stopTool() method.
To ensure that reported statistics remain consistent if tool is stopped by error, the statistic thread is now scheduled by a ScheduledExecutorService.
---
 .../forgerock/opendj/ldap/tools/AddRate.java  |   2 +-
 .../opendj/ldap/tools/PerformanceRunner.java  | 200 ++++++++++--------
 .../opendj/ldap/tools/tools.properties        |   3 +-
 3 files changed, 111 insertions(+), 94 deletions(-)

diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index 5cb887ec5..0123071c5 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -264,7 +264,7 @@ void performStopOperations() {
                         throw new IllegalStateException();
                     }
                 } else if (!purgeEnabled) {
-                    stopRequested = true;
+                    stopTool();
                 }
             }
         }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index c857085a6..f0d575d64 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -46,6 +46,9 @@
 import java.util.Map.Entry;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentSkipListMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -255,6 +258,10 @@ class StatsThread extends Thread {
         private final boolean isScriptFriendly = app.isScriptFriendly();
         private MultiColumnPrinter printer;
 
+
+        private long totalStatTimeMs;
+        private long gcDurationMs;
+
         public StatsThread(final String... additionalColumns) {
             super("Stats Thread");
 
@@ -364,62 +371,59 @@ private void printResultsTitleScriptFriendly() {
             out.println();
         }
 
-        @Override
-        public void run() {
+        private void printTitle() {
             printResultsTitle();
+        }
 
-            long totalStatTimeMs = System.currentTimeMillis();
-            long gcDurationMs = getGCDuration();
+        private void initStats() {
+            totalStatTimeMs = System.currentTimeMillis();
+            gcDurationMs = getGCDuration();
+        }
 
-            while (!stopRequested) {
-                try {
-                    sleep(statsInterval);
-                } catch (final InterruptedException ie) {
-                    // Ignore.
-                }
-                lastStatTimeMs = totalStatTimeMs;
-                totalStatTimeMs = System.currentTimeMillis();
+        @Override
+        public void run() {
+            lastStatTimeMs = totalStatTimeMs;
+            totalStatTimeMs = System.currentTimeMillis();
 
-                lastGCDurationMs = gcDurationMs;
-                gcDurationMs = getGCDuration();
-                final long gcIntervalDurationMs = gcDurationMs - lastGCDurationMs;
+            lastGCDurationMs = gcDurationMs;
+            gcDurationMs = getGCDuration();
+            final long gcIntervalDurationMs = gcDurationMs - lastGCDurationMs;
 
-                computeStatsForInterval(totalStatTimeMs, gcIntervalDurationMs);
-                final long intervalResultCount = intervalSuccessCount + intervalFailedCount;
+            computeStatsForInterval(totalStatTimeMs, gcIntervalDurationMs);
+            final long intervalResultCount = intervalSuccessCount + intervalFailedCount;
 
-                final String[] printableStats = new String[numColumns];
-                Arrays.fill(printableStats, "-");
-                printableStats[0] = getDivisionResult(intervalResultCount, intervalDurationSec, 1);
-                printableStats[1] = getDivisionResult(totalResultCount, totalDurationSec, 1);
+            final String[] printableStats = new String[numColumns];
+            Arrays.fill(printableStats, "-");
+            printableStats[0] = getDivisionResult(intervalResultCount, intervalDurationSec, 1);
+            printableStats[1] = getDivisionResult(totalResultCount, totalDurationSec, 1);
 
-                final long intervalWaitTimeMs = NANOSECONDS.toMillis(intervalWaitTimeNs) - gcIntervalDurationMs;
-                printableStats[2] = getDivisionResult(intervalWaitTimeMs, intervalResultCount, 3);
+            final long intervalWaitTimeMs = NANOSECONDS.toMillis(intervalWaitTimeNs) - gcIntervalDurationMs;
+            printableStats[2] = getDivisionResult(intervalWaitTimeMs, intervalResultCount, 3);
 
-                final long totalWaitTimeMs = NANOSECONDS.toMillis(totalWaitTimeNs) - gcDurationMs;
-                printableStats[3] = getDivisionResult(totalWaitTimeMs, totalResultCount, 3);
+            final long totalWaitTimeMs = NANOSECONDS.toMillis(totalWaitTimeNs) - gcDurationMs;
+            printableStats[3] = getDivisionResult(totalWaitTimeMs, totalResultCount, 3);
 
-                int i = 4;
-                final List computedPercentiles = eTimesBuckets.getPercentile(percentiles, totalOperationCount);
-                for (int j = computedPercentiles.size() - 1; j >= 0; j--) {
-                    printableStats[i++] = getDivisionResult(computedPercentiles.get(j) , 1000.0, 2);
-                }
-                i = 4 + percentiles.length;
-                printableStats[i++] = intervalFailedCount == 0
-                                      ? "0.0"
-                                      : getDivisionResult(intervalFailedCount, intervalDurationSec, 1);
-                if (isAsync) {
-                    printableStats[i++] = getDivisionResult(intervalOperationCount, intervalResultCount, 1);
-                }
+            int i = 4;
+            final List computedPercentiles = eTimesBuckets.getPercentile(percentiles, totalOperationCount);
+            for (int j = computedPercentiles.size() - 1; j >= 0; j--) {
+                printableStats[i++] = getDivisionResult(computedPercentiles.get(j) , 1000.0, 2);
+            }
+            i = 4 + percentiles.length;
+            printableStats[i++] = intervalFailedCount == 0
+                                  ? "0.0"
+                                  : getDivisionResult(intervalFailedCount, intervalDurationSec, 1);
+            if (isAsync) {
+                printableStats[i++] = getDivisionResult(intervalOperationCount, intervalResultCount, 1);
+            }
 
-                for (final String column : getAdditionalColumns()) {
-                    printableStats[i++] = column;
-                }
+            for (final String column : getAdditionalColumns()) {
+                printableStats[i++] = column;
+            }
 
-                if (isScriptFriendly) {
-                    printScriptFriendlyStats(printableStats);
-                } else {
-                    printer.printRow(printableStats);
-                }
+            if (isScriptFriendly) {
+                printScriptFriendlyStats(printableStats);
+            } else {
+                printer.printRow(printableStats);
             }
         }
 
@@ -491,7 +495,7 @@ class TimerThread extends Thread {
         }
 
         void performStopOperations() {
-            stopRequested = true;
+            stopTool();
         }
 
         @Override
@@ -566,37 +570,14 @@ public void run() {
 
             while (!stopRequested && !localStopRequested
                     && (maxIterations <= 0 || count < maxIterations)) {
-                if (this.connection == null) {
-                    try {
-                        connection = connectionFactory.getConnectionAsync().getOrThrow();
-                    } catch (final InterruptedException e) {
-                        // Ignore and check stop requested
-                        continue;
-                    } catch (final LdapException e) {
-                        app.errPrintln(LocalizableMessage.raw(e.getResult().getDiagnosticMessage()));
-                        if (e.getCause() != null && app.isVerbose()) {
-                            e.getCause().printStackTrace(app.getErrorStream());
-                        }
-                        stopRequested = true;
-                        break;
-                    }
-                } else {
-                    connection = this.connection;
-                    if (!noRebind && bindRequest != null) {
-                        try {
-                            connection.bindAsync(bindRequest).getOrThrow();
-                        } catch (final InterruptedException e) {
-                            // Ignore and check stop requested
-                            continue;
-                        } catch (final LdapException e) {
-                            app.errPrintln(LocalizableMessage.raw(e.getResult().toString()));
-                            if (e.getCause() != null && app.isVerbose()) {
-                                e.getCause().printStackTrace(app.getErrorStream());
-                            }
-                            stopRequested = true;
-                            break;
-                        }
-                    }
+                try {
+                    connection = getConnectionToUse();
+                } catch (final InterruptedException e) {
+                    // Ignore and check stop requested
+                    continue;
+                } catch (final LdapException e) {
+                    handleConnectionError(false, e);
+                    break;
                 }
 
                 long startTimeNs = System.nanoTime();
@@ -609,9 +590,9 @@ public void run() {
                         // Ignore and check stop requested
                         continue;
                     } catch (final LdapException e) {
-                        if (e.getCause() instanceof IOException) {
+                        if (!stopRequested && e.getCause() instanceof IOException) {
                             e.getCause().printStackTrace(app.getErrorStream());
-                            stopRequested = true;
+                            stopTool(e);
                             break;
                         }
                         // Ignore. Handled by result handler
@@ -640,6 +621,18 @@ public void run() {
             }
         }
 
+        private Connection getConnectionToUse() throws InterruptedException, LdapException {
+            if (this.connection == null) {
+                return connectionFactory.getConnectionAsync().getOrThrow();
+            } else {
+                final Connection resultConnection = this.connection;
+                if (!noRebind && bindRequest != null) {
+                    resultConnection.bindAsync(bindRequest).getOrThrow();
+                }
+                return resultConnection;
+            }
+        }
+
         void incrementIterationCount() {
             count++;
         }
@@ -674,7 +667,8 @@ protected DataSource[] initialValue() {
 
     int numThreads;
     int numConnections;
-    volatile boolean stopRequested;
+    private boolean stopRequested;
+
     private volatile boolean isWarmingUp;
     private int targetThroughput;
     private int maxIterations;
@@ -685,7 +679,7 @@ protected DataSource[] initialValue() {
     private boolean isAsync;
     private boolean noRebind;
     private BindRequest bindRequest;
-    private int statsInterval;
+    private int statsIntervalMs;
     private final IntegerArgument numThreadsArgument;
     private final IntegerArgument maxDurationArgument;
     private final IntegerArgument statsIntervalArgument;
@@ -700,6 +694,8 @@ protected DataSource[] initialValue() {
     protected final IntegerArgument warmUpArgument;
 
     private final List workerThreads = new ArrayList<>();
+    private final ScheduledExecutorService statThreadScheduler = Executors.newSingleThreadScheduledExecutor();
+    private StatsThread statsThread;
 
     PerformanceRunner(final PerformanceRunnerOptions options) throws ArgumentException {
         ArgumentParser argParser = options.getArgumentParser();
@@ -820,12 +816,11 @@ public void handleConnectionClosed() {
     @Override
     public synchronized void handleConnectionError(final boolean isDisconnectNotification, final LdapException error) {
         if (!stopRequested) {
-            app.errPrintln(LocalizableMessage.raw("Error occurred on one or more connections: "
-                    + error.getResult()));
+            app.errPrintln(ERROR_RATE_TOOLS_CAN_NOT_GET_CONNECTION.get(error.getMessage()));
             if (error.getCause() != null && app.isVerbose()) {
                 error.getCause().printStackTrace(app.getErrorStream());
             }
-            stopRequested = true;
+            stopTool(error);
         }
     }
 
@@ -840,7 +835,7 @@ public final void validate() throws ArgumentException {
         warmUpDuration = warmUpArgument.getIntValue() * 1000L;
         maxIterations = maxIterationsArgument.getIntValue() / numConnections / numThreads;
         maxDurationTime = maxDurationArgument.getIntValue() * 1000L;
-        statsInterval = statsIntervalArgument.getIntValue() * 1000;
+        statsIntervalMs = statsIntervalArgument.getIntValue() * 1000;
         targetThroughput = targetThroughputArgument.getIntValue();
 
         isAsync = asyncArgument.isPresent();
@@ -904,8 +899,7 @@ final int run(final ConnectionFactory connectionFactory) {
                 newEndTimerThread(maxDurationTime).start();
             }
 
-            final StatsThread statsThread = newStatsThread();
-
+            statsThread = newStatsThread();
             if (isWarmingUp) {
                 if (!app.isScriptFriendly()) {
                     app.println(INFO_TOOL_WARMING_UP.get(warmUpDuration / 1000));
@@ -915,14 +909,16 @@ final int run(final ConnectionFactory connectionFactory) {
                 isWarmingUp = false;
             }
 
-            statsThread.start();
+            statsThread.printTitle();
+            statsThread.initStats();
+            statThreadScheduler.scheduleAtFixedRate(
+                    statsThread, statsIntervalMs, statsIntervalMs, TimeUnit.MILLISECONDS);
             joinAllWorkerThreads();
-            stopRequested = true;
-            statsThread.join();
+            stopTool();
         } catch (final InterruptedException e) {
-            stopRequested = true;
+            stopTool(e);
         } catch (final LdapException e) {
-            stopRequested = true;
+            stopTool(e);
             printErrorMessage(app, e);
             return e.getResult().getResultCode().intValue();
         } finally {
@@ -938,6 +934,26 @@ private void validateCanConnectToServer(ConnectionFactory connectionFactory) thr
         }
     }
 
+    synchronized void stopTool() {
+        stopTool(null);
+    }
+
+    synchronized void stopTool(final Exception e) {
+        if (!stopRequested) {
+            stopRequested = true;
+            statThreadScheduler.shutdown();
+            if (e == null) {
+                // If stats thread is printing stats, wait for it to finish.
+                try {
+                    statThreadScheduler.awaitTermination(50, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException ignored) {
+                    // Do nothing.
+                }
+                statsThread.run();
+            }
+        }
+    }
+
     void setBindRequest(final BindRequest request) {
         this.bindRequest = request;
     }
diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index 827f83f03..d318ea6bc 100755
--- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -22,7 +22,7 @@
 #
 #
 #      Copyright 2010 Sun Microsystems, Inc.
-#      Portions copyright 2012-2015 ForgeRock AS.
+#      Portions copyright 2012-2016 ForgeRock AS.
 #
 #
 # Utility messages
@@ -138,6 +138,7 @@ INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage:  java %s  {options}
 INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage:  %s  {options}
 INFO_ARGPARSER_USAGE_TRAILINGARGS={trailing-arguments}
 INFO_ARGPARSER_USAGE_DEFAULT_VALUE=Default value: %s
+ERROR_RATE_TOOLS_CAN_NOT_GET_CONNECTION=%s\nThe tool is going to stop.
 #
 # Extension messages
 #

From 3695bae95d4a686253fc94f10fc44db34a87d077 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Mon, 4 Jan 2016 14:40:17 +0100
Subject: [PATCH 042/125] OPENDJ-2469 Improve performance metric tools

This change consists in three steps:

* Reboot the MultiColumnPrinter
** In order to help code readability and to prepare metrics core
integration, the MultiColumnPrinter has been refactored.
** Add a Column class to store metrics informations related to UI
** The new printer can be used to print formatted data line in separated
columns or just raw CSV line.

* Use metrics to render stats
** The metrics framework helps to make the code more readable.
** It also use LongAdder for counters.

* Use HdrHistogram to compute quantiles
** To compute three, four and five nines stats, we now use HdrHistogram
instead of our own histogram implementation
** This API is designed for recording histograms of value measurements
in latency and performance sensitive applications.
** We use a bridge to integrate HdrHistogram with metrics framework (see
THIRDPARTYREADME file)

* Minor changes
** Remove child method must call super anti pattern in UpdateStatsResultHandler class hierarchy
** Extract StatsThread class inits own file
** Various other cleanups
---
 .../opendj/cli/MultiColumnPrinter.java        | 795 ++++++++++--------
 .../java/com/forgerock/opendj/cli/Utils.java  |  18 +-
 .../legal-notices/THIRDPARTYREADME.txt        | 125 +++
 opendj-ldap-toolkit/pom.xml                   |  11 +
 .../forgerock/opendj/ldap/tools/AddRate.java  | 104 +--
 .../forgerock/opendj/ldap/tools/AuthRate.java |  53 +-
 .../forgerock/opendj/ldap/tools/ModRate.java  |  10 +-
 .../opendj/ldap/tools/PerformanceRunner.java  | 565 ++-----------
 .../opendj/ldap/tools/SearchRate.java         |  50 +-
 .../opendj/ldap/tools/StatsThread.java        | 446 ++++++++++
 .../opendj/ldap/tools/tools.properties        |   2 +-
 .../opendj/ldap/tools/AuthRateITCase.java     |   2 +-
 .../tools/PerformanceRunnerStatsTestCase.java |  50 --
 opendj-sdk-parent/pom.xml                     |   8 +
 14 files changed, 1223 insertions(+), 1016 deletions(-)
 create mode 100644 opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
 delete mode 100644 opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java

diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
index 53bba32b8..277f57c2d 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java
@@ -22,441 +22,508 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions copyright 2012-2015 ForgeRock AS.
+ *      Portions copyright 2012-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.cli;
 
-import java.util.Arrays;
+import static com.forgerock.opendj.cli.Utils.repeat;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Vector;
+import java.util.Locale;
+
+import org.forgerock.util.Reject;
 
 /**
- * Utility class for printing aligned columns of text.
- * 

- * This class allows you to specify:
- * 
    
- * 
  • The number of columns in the output. This will determine the dimension of
- * the string arrays passed to add(String[]) or addTitle(String[]).
- * 
  • spacing/gap between columns
- * 
  • character to use for title border (null means no border)
- * 
  • column alignment. Only LEFT/CENTER is supported for now.
- * 

- * 

- * Example usage:
- *
- * 
- * MyPrinter mp = new MyPrinter(3, 2, "-");
- * String oneRow[] = new String[3];
- * oneRow[0] = "User Name";
- * oneRow[1] = "Email Address";
- * oneRow[2] = "Phone Number";
- * mp.addTitle(oneRow);
- * oneRow[0] = "Bob";
- * oneRow[1] = "bob@foo.com";
- * oneRow[2] = "123-4567";
- * mp.add(oneRow);
- * oneRow[0] = "John";
- * oneRow[1] = "john@foo.com";
- * oneRow[2] = "456-7890";
- * mp.add(oneRow);
- * mp.print();
- * 

- * 

- * The above would print:
- * 

- *
- * 
- *  --------------------------------------
- *  User Name  Email Address  Phone Number
- *  --------------------------------------
- *  Bob        bob@foo.com    123-4567
- *  John       john@foo.com   456-7890
- * 

- * 

- * This class also supports multi-row titles and having title strings spanning
- * multiple columns. Example usage:
- *
- * 
- * TestPrinter tp = new TestPrinter(4, 2, "-");
- * String oneRow[] = new String[4];
- * int[] span = new int[4];
- * span[0] = 2; // spans 2 columns
- * span[1] = 0; // spans 0 columns
- * span[2] = 2; // spans 2 columns
- * span[3] = 0; // spans 0 columns
- * tp.setTitleAlign(CENTER);
- * oneRow[0] = "Name";
- * oneRow[1] = "";
- * oneRow[2] = "Contact";
- * oneRow[3] = "";
- * tp.addTitle(oneRow, span);
- * oneRow[0] = "First";
- * oneRow[1] = "Last";
- * oneRow[2] = "Email";
- * oneRow[3] = "Phone";
- * tp.addTitle(oneRow);
- * oneRow[0] = "Bob";
- * oneRow[1] = "Jones";
- * oneRow[2] = "bob@foo.com";
- * oneRow[3] = "123-4567";
- * tp.add(oneRow);
- * oneRow[0] = "John";
- * oneRow[1] = "Doe";
- * oneRow[2] = "john@foo.com";
- * oneRow[3] = "456-7890";
- * tp.add(oneRow);
- * tp.println();
- * 

- * 

- * The above would print:
- * 

+ * Utility class for printing columns of data.
+ * 

+ * This printer can be used to print data in formatted table or in csv format.
+ * 

+ * Regarding the formatting table feature, this class allows you to specify for each {@link Column}s:
+ * 
    
+ *     
  • A unique identifier
    • 
+ *     
  • The column title which will be printed by a call to {@link MultiColumnPrinter#printTitleLine()}
    • 
+ *     
  • The size (if a cell's data is bigger than the predefined size, then the data will not be truncated,
+ *         i.e. it will overflow)
    • 
+ *     
  • The number of digits to keep (for {@link Double} data)
    • 
+ * 

+ * 

+ * Code to write data is independent of the {@link MultiColumnPrinter} configuration:
+ * 
+ * void printData(final MultiColumnPrinter printer) {
+ *     String[][] myData = new String[][] {
+ *         new String[]{"U.S.A", "34.2", "40.8", ".us"},
+ *         new String[]{"United Kingdom", "261.1", "31.6", ".uk"},
+ *         new String[]{"France", "98.8", "30.1", ".fr"}
+ *     };
  *
- * 
- *      ------------------------------------
- *          Name             Contact
- *      First  Last      Email       Phone
- *      ------------------------------------
- *      Bob    Jones  bob@foo.com   123-4567
- *      John   Doe    john@foo.com  456-7890
- * 

+ *     int i;
+ *     for (String[] countryData : myData) {
+ *         i = 0;
+ *         for (final MultiColumnPrinter.Column column : printer.getColumns()) {
+ *             printer.printData(countryData[i++]);
+ *         }
+ *     }
+ *  }
+ * 

+ * 

+ * The following code sample presents how to create a {@link MultiColumnPrinter} to write CSV data:
+ * 
+ * final List columns = new ArrayList<>();
+ * columns.add(MultiColumnPrinter.column("CountryNameColumnId", "country_name", 0));
+ * columns.add(MultiColumnPrinter.column("populationDensityId", "population_density", 1));
+ * columns.add(MultiColumnPrinter.column("GiniId", "gini", 1));
+ * columns.add(MultiColumnPrinter.column("internetTLDId", "internet_tld", 0));
+ * MultiColumnPrinter myCsvPrinter = MultiColumnPrinter.builder(System.out, columns)
+ *                                                     .columnSeparator(",")
+ *                                                     .build();
+ * printData(myCsvPrinter);
+ * 

+ * 

+ * The code above would print:
+ * 
+ * country_name,population_density,gini,internet_tld
+ * U.S.A,34.2,40.8,.us
+ * United Kingdom,261.1,31.6,.uk
+ * France,98.8,30.1,.fr
+ * 

+ * 

+ * The following code sample presents how to configure a {@link MultiColumnPrinter}
+ * to print the same data on console with some title headers.
+ * 
+ *     final List columns = new ArrayList<>();
+ *     columns.add(MultiColumnPrinter.separatorColumn());
+ *     columns.add(MultiColumnPrinter.column("CountryNameColumnId", "Country Name", 15, 0));
+ *     columns.add(MultiColumnPrinter.column("populationDensityId", "Density", 10, 1));
+ *     columns.add(MultiColumnPrinter.separatorColumn());
+ *     columns.add(MultiColumnPrinter.column("GiniID", "GINI", 5, 1));
+ *     columns.add(MultiColumnPrinter.column("internetTLDID", "TLD", 5, 0));
+ *     columns.add(MultiColumnPrinter.separatorColumn());
+ *     MultiColumnPrinter myPrinter = MultiColumnPrinter.builder(System.out, columns)
+ *                                                      .format(true)
+ *                                                      .columnSeparator("  ")
+ *                                                      .titleAlignment(MultiColumnPrinter.Alignment.CENTER)
+ *                                                      .build();
+ *     myPrinter.printDashedLine();
+ *     myPrinter.printTitleSection("General Information", 2);
+ *     myPrinter.printTitleSection("Data", 2);
+ *     myPrinter.printTitleLine();
+ *     myPrinter.printDashedLine();
+ *     printData(myPrinter);
+ *     myPrinter.printDashedLine();
+ * 

+ * 

+ * The code above would print:
+ * 
+ * --------------------------------------------------
+ * |       General Information     |       Data     |
+ * |     Country Name     Density  |   GINI    TLD  |
+ * --------------------------------------------------
+ * |            U.S.A        34.2  |   40.8    .us  |
+ * |   United Kingdom       261.1  |   31.6    .uk  |
+ * |           France        98.8  |   30.1    .fr  |
+ * --------------------------------------------------
+ * 

  */
 public final class MultiColumnPrinter {
 
-    /** Left ID. */
-    public static final int LEFT = 0;
-    /** Center ID. */
-    public static final int CENTER = 1;
-    /** Right ID. */
-    public static final int RIGHT = 2;
-
-    private int numCol = 2;
-    private int gap = 4;
-
-    private int align = CENTER;
-    private int titleAlign = CENTER;
-
-    private String border;
-    private final List titleTable = new Vector<>();
-    private final List titleSpanTable = new Vector<>();
-    private final int[] curLength;
+    /** The data alignment. */
+    public enum Alignment {
+        /** Data will be left-aligned. */
+        LEFT,
+        /** Data will be centered. */
+        CENTER,
+        /** Data will be right-aligned. */
+        RIGHT
+    }
 
-    private final ConsoleApplication app;
+    private static final String SEPARATOR_ID = "separator";
+    private static int separatorIdNumber;
 
     /**
-     * Creates a sorted new MultiColumnPrinter class using LEFT alignment and
-     * with no title border.
+     * Returns a new separator {@link Column}.
+     * 

+     * This kind of {@link Column} can be used to separate data sections.
      *
-     * @param numCol
-     *            number of columns
-     * @param gap
-     *            gap between each column
-     * @param app
-     *            the console application to use for outputting data
+     * @return A new separator {@link Column}.
      */
-    public MultiColumnPrinter(final int numCol, final int gap, final ConsoleApplication app) {
-        this(numCol, gap, null, LEFT, app);
+    public static Column separatorColumn() {
+        return new Column(SEPARATOR_ID + separatorIdNumber++, "", 1, 0);
     }
 
     /**
-     * Creates a sorted new MultiColumnPrinter class using LEFT alignment.
+     * Creates a new {@link Column} with the provided arguments.
      *
-     * @param numCol
-     *            number of columns
-     * @param gap
-     *            gap between each column
-     * @param border
-     *            character used to frame the titles
-     * @param app
-     *            the console application to use for outputting data
+     * @param id
+     *      The column identifier.
+     * @param title
+     *      The column title.
+     * @param doublePrecision
+     *      The double precision used to print {@link Double} data for this column.
+     *      See {@link MultiColumnPrinter#printData(Double)}.
+     * @return
+     *      A new Column with the provided arguments.
      */
-    public MultiColumnPrinter(final int numCol, final int gap, final String border,
-            final ConsoleApplication app) {
-        this(numCol, gap, border, LEFT, app);
+    public static Column column(final String id, final String title, final int doublePrecision) {
+        return new Column(id, title, 1, doublePrecision);
     }
 
     /**
-     * Creates a new MultiColumnPrinter class.
+     * Creates a new Column with the provided arguments.
      *
-     * @param numCol
-     *            number of columns
-     * @param gap
-     *            gap between each column
-     * @param border
-     *            character used to frame the titles
-     * @param align
-     *            type of alignment within columns
-     * @param app
-     *            the console application to use for outputting data
+     * @param id
+     *      The column identifier.
+     * @param title
+     *      The column title.
+     * @param width
+     *      The column width.
+     *      This information will only be used if the associated
+     *      {@link MultiColumnPrinter} is configured to apply formatting.
+     *      See {@link Builder#format(boolean)}.
+     * @param doublePrecision
+     *      The double precision to use to print data for this column.
+     * @return
+     *      A new Column with the provided arguments.
      */
-    public MultiColumnPrinter(final int numCol, final int gap, final String border, final int align,
-            final ConsoleApplication app) {
-        curLength = new int[numCol];
+    public static Column column(final String id, final String title, final int width, final int doublePrecision) {
+        return new Column(id, title, Math.max(width, title.length()), doublePrecision);
+    }
 
-        this.numCol = numCol;
-        this.gap = gap;
-        this.border = border;
-        this.align = align;
-        this.titleAlign = LEFT;
+    /**
+     * This class describes a Column of data used in the {@link MultiColumnPrinter}.
+     * 

+     * A column consists in the following fields:
+     * 
    
+     *     
  • An identifier for the associated data.
+     *     
  • A title which is printed when {@link MultiColumnPrinter#printTitleLine()} is called.
+     *     
  • A width which is the max width for this column's data.
+     *         This information will only be used if the associated {@link MultiColumnPrinter}
+     *         is configure to apply formatting.See {@link Builder#format(boolean)}.
+     *     
  • A double precision which is the number of decimal to print for numeric data.
+     *         See {@link MultiColumnPrinter#printData(Double)}.
+     * 

+     */
+    public static final class Column {
+        private final String id;
+        private final String title;
+        private final int width;
+        private final int doublePrecision;
+
+        private Column(final String id, final String title, final int width, final int doublePrecision) {
+            this.id = id;
+            this.title = title;
+            this.width = Math.max(width, title.length());
+            this.doublePrecision = doublePrecision;
+        }
 
-        this.app = app;
+        /**
+         * Returns this {@link Column} identifier.
+         *
+         * @return This {@link Column} identifier.
+         */
+        public String getId() {
+            return id;
+        }
     }
 
     /**
-     * Adds to the row of strings to be used as the title for the table.
+     * Creates a new {@link Builder} to build a {@link MultiColumnPrinter}.
      *
-     * @param row
-     *            Array of strings to print in one row of title.
+     * @param stream
+     *      The {@link PrintStream} to use to print data.
+     * @param columns
+     *      The {@link List} of {@link Column} data to print.
+     * @return
+     *      A new {@link Builder} to build a {@link MultiColumnPrinter}.
      */
-    public void addTitle(final String[] row) {
-        if (row == null) {
-            return;
+    public static Builder builder(final PrintStream stream, final List columns) {
+        return new Builder(stream, columns);
+    }
+
+    /** A fluent API for incrementally constructing {@link MultiColumnPrinter}. */
+    public static final class Builder {
+        private final PrintStream stream;
+        private final List columns;
+
+        private Alignment titleAlignment = Alignment.RIGHT;
+        private String columnSeparator = " ";
+        private boolean format;
+
+        private Builder(final PrintStream stream, final List columns) {
+            Reject.ifNull(stream);
+            this.stream = stream;
+            this.columns = columns;
         }
 
-        final int[] span = new int[row.length];
-        for (int i = 0; i < row.length; i++) {
-            span[i] = 1;
+        /**
+         * Sets whether the {@link MultiColumnPrinter} needs to apply formatting.
+         * 

+         * Default value is {@code false}.
+         *
+         * @param format
+         *      {@code true} if the {@link MultiColumnPrinter} needs to apply formatting.
+         * @return This builder.
+         */
+        public Builder format(final boolean format) {
+            this.format = format;
+            return this;
         }
 
-        addTitle(row, span);
+        /**
+         * Sets the alignment for title elements which will be printed by the {@link MultiColumnPrinter}.
+         * 

+         * This is used only if the printer is configured to
+         * apply formatting, see {@link Builder#format(boolean)}.
+         * 

+         * Default value is {@link Alignment#RIGHT}.
+         *
+         * @param titleAlignment
+         *      The title alignment.
+         * @return This builder.
+         */
+        public Builder titleAlignment(final Alignment titleAlignment) {
+            this.titleAlignment = titleAlignment;
+            return this;
+        }
+
+        /**
+         * Sets the sequence to use to separate column.
+         * 

+         * Default value is {@code " "}.
+         *
+         * @param separator
+         *      The sequence {@link String}.
+         * @return This builder.
+         */
+        public Builder columnSeparator(final String separator) {
+            this.columnSeparator = separator;
+            return this;
+        }
+
+        /**
+         * Creates a new {@link MultiColumnPrinter} as configured in this {@link Builder}.
+         *
+         * @return A new {@link MultiColumnPrinter} as configured in this {@link Builder}.
+         */
+        public MultiColumnPrinter build() {
+            return new MultiColumnPrinter(this);
+        }
+    }
+
+    private final PrintStream stream;
+    private final List columns;
+    private final boolean format;
+    private final Alignment titleAlignment;
+    private final String columnSeparator;
+
+    private List printableColumns;
+    private final int lineLength;
+    private Iterator columnIterator;
+    private Column currentColumn;
+
+    private MultiColumnPrinter(final Builder builder) {
+        this.stream = builder.stream;
+        this.columns = Collections.unmodifiableList(builder.columns);
+        this.format = builder.format;
+        this.columnSeparator = builder.columnSeparator;
+        this.titleAlignment = builder.titleAlignment;
+        this.lineLength = computeLineLength();
+        resetIterator();
+        computePrintableColumns();
+    }
+
+    /** Prints a dashed line. */
+    public void printDashedLine() {
+        startNewLineIfNeeded();
+        for (int i = 0; i < lineLength; i++) {
+            stream.print('-');
+        }
+        stream.println();
     }
 
     /**
-     * Adds to the row of strings to be used as the title for the table. Also
-     * allows for certain title strings to span multiple columns The span
-     * parameter is an array of integers which indicate how many columns the
-     * corresponding title string will occupy. For a row that is 4 columns
-     * wide, it is possible to have some title strings in a row to 'span'
-     * multiple columns:
-     * 

-     *
-     * 
-     * ------------------------------------
-     *     Name             Contact
-     * First  Last      Email       Phone
-     * ------------------------------------
-     * Bob    Jones  bob@foo.com   123-4567
-     * John   Doe    john@foo.com  456-7890
-     * 

-     *
-     * In the example above, the title row has a string 'Name' that spans 2
-     * columns. The string 'Contact' also spans 2 columns. The above is done
-     * by passing in to addTitle() an array that contains:
-     *
-     * 
-     * span[0] = 2; // spans 2 columns
-     * span[1] = 0; // spans 0 columns, ignore
-     * span[2] = 2; // spans 2 columns
-     * span[3] = 0; // spans 0 columns, ignore
-     * 

-     * 

-     * A span value of 1 is the default. The method addTitle(String[] row)
-     * basically does:
+     * Formats and prints the provided text data.
+     * Merge the provided text over the provided number of column.
+     * 

+     * Separator columns between merged columns will not be printed.
      *
-     * 
-     * int[] span = new int[row.length];
-     * for (int i = 0; i < row.length; i++) {
-     *     span[i] = 1;
-     * }
-     * addTitle(row, span);
-     * 

-     *
-     * @param row
-     *            Array of strings to print in one row of title.
-     * @param span
-     *            Array of integers that reflect the number of columns the
-     *            corresponding title string will occupy.
+     * @param data
+     *      The section title to print.
+     * @param rowSpan
+     *      Specifies the number of rows a cell should span.
      */
-    public void addTitle(final String[] row, final int[] span) {
-        // Need to create a new instance of it, otherwise the new values
-        // will always overwrite the old values.
-        titleTable.add(Arrays.copyOf(row, row.length));
-        titleSpanTable.add(span);
+    public void printTitleSection(final String data, final int rowSpan) {
+        consumeSeparatorColumn();
+        int lengthToPad = 0;
+        int nbColumnMerged = 0;
+
+        while (columnIterator.hasNext() && nbColumnMerged < rowSpan) {
+            lengthToPad += currentColumn.width + columnSeparator.length();
+            if (!isSeparatorColumn(currentColumn)) {
+                nbColumnMerged++;
+            }
+            currentColumn = columnIterator.next();
+        }
+        stream.print(align(data, titleAlignment, lengthToPad));
+        consumeSeparatorColumn();
+        if (!columnIterator.hasNext()) {
+            nextLine();
+        }
+    }
+
+    /** Prints a line with all column title and separator. */
+    public void printTitleLine() {
+        startNewLineIfNeeded();
+        passFirstSeparatorColumn();
+        for (final Column column : this.printableColumns) {
+            printCell(column.title, Alignment.RIGHT);
+        }
     }
 
     /**
-     * Clears title strings.
+     * Prints the provided {@link Double} value on the current column.
+     * 

+     * If this {@link MultiColumnPrinter} is configured to apply formatting,
+     * the provided value will be truncated according to the decimal
+     * precision set in the corresponding {@link Column}.
+     * 

+     * See {@link MultiColumnPrinter#column(String, String, int, int)} for more details.
+     *
+     * @param value
+     *      The double value to print.
      */
-    public void clearTitle() {
-        titleTable.clear();
-        titleSpanTable.clear();
+    public void printData(final Double value) {
+        passFirstSeparatorColumn();
+        printData(value.isNaN() ? "-"
+                                : String.format(Locale.ENGLISH, "%." + currentColumn.doublePrecision + "f", value));
     }
 
     /**
-     * Adds one row of text to output.
+     * Prints the provided text data on the current column.
      *
-     * @param row
-     *            Array of strings to print in one row.
+     * @param data
+     *      The text data to print.
      */
-    public void printRow(final String... row) {
-        for (int i = 0; i < numCol; i++) {
-            if (titleAlign == RIGHT) {
-                final int spaceBefore = curLength[i] - row[i].length();
-                printSpaces(spaceBefore);
-                app.getOutputStream().print(row[i]);
-                if (i < numCol - 1) {
-                    printSpaces(gap);
-                }
-            } else if (align == CENTER) {
-                int space1, space2;
-                space1 = (curLength[i] - row[i].length()) / 2;
-                space2 = curLength[i] - row[i].length() - space1;
-
-                printSpaces(space1);
-                app.getOutputStream().print(row[i]);
-                printSpaces(space2);
-                if (i < numCol - 1) {
-                    printSpaces(gap);
-                }
-            } else {
-                app.getOutputStream().print(row[i]);
-                if (i < numCol - 1) {
-                    printSpaces(curLength[i] - row[i].length() + gap);
-                }
-            }
-        }
-        app.getOutputStream().println("");
+    public void printData(final String data) {
+        passFirstSeparatorColumn();
+        printCell(data, Alignment.RIGHT);
     }
 
     /**
-     * Prints the table title.
+     * Returns the data {@link Column} list of this {@link MultiColumnPrinter}.
+     * 

+     * Separator columns are filtered out.
+     *
+     * @return The {@link Column} list of this {@link MultiColumnPrinter}.
      */
-    public void printTitle() {
-        // Get the longest string for each column and store in curLength[]
-
-        // Scan through title rows
-        Iterator spanEnum = titleSpanTable.iterator();
-        for (String[] row : titleTable) {
-            final int[] curSpan = spanEnum.next();
-
-            for (int i = 0; i < numCol; i++) {
-                // None of the fields should be null, but if it
-                // happens to be so, replace it with "-".
-                if (row[i] == null) {
-                    row[i] = "-";
-                }
-
-                int len = row[i].length();
-
-                /*
-                 * If a title string spans multiple columns, then the space it
-                 * occupies in each column is at most len/span (since we have
-                 * gap to take into account as well).
-                 */
-                final int span = curSpan[i];
-                int rem = 0;
-                if (span > 1) {
-                    rem = len % span;
-                    len = len / span;
-                }
-
-                if (curLength[i] < len) {
-                    curLength[i] = len;
-
-                    if ((span > 1) && ((i + span) <= numCol)) {
-                        for (int j = i + 1; j < (i + span); ++j) {
-                            curLength[j] = len;
-                        }
-
-                        /*
-                         * Add remainder to last column in span to avoid
-                         * round-off errors.
-                         */
-                        curLength[(i + span) - 1] += rem;
-                    }
-                }
-            }
+    public List getColumns() {
+        return printableColumns;
+    }
+
+    private void printCell(final String data, final Alignment alignment) {
+        String toPrint = format ? align(data, alignment, currentColumn.width) : data;
+        if (columnIterator.hasNext()) {
+            toPrint += columnSeparator;
         }
+        stream.print(toPrint);
+        nextLineOnEOLOrNextColumn();
+    }
 
-        printBorder();
-
-        spanEnum = titleSpanTable.iterator();
-        for (String[] row : titleTable) {
-            final int[] curSpan = spanEnum.next();
-
-            for (int i = 0; i < numCol; i++) {
-                int availableSpace = 0;
-                final int span = curSpan[i];
-
-                if (span == 0) {
-                    continue;
-                }
-
-                availableSpace = curLength[i];
-
-                if ((span > 1) && ((i + span) <= numCol)) {
-                    for (int j = i + 1; j < (i + span); ++j) {
-                        availableSpace += gap;
-                        availableSpace += curLength[j];
-                    }
-                }
-
-                if (titleAlign == RIGHT) {
-                    final int spaceBefore = availableSpace - row[i].length();
-                    printSpaces(spaceBefore);
-                    app.getOutputStream().print(row[i]);
-                    if (i < numCol - 1) {
-                        printSpaces(gap);
-                    }
-                } else if (titleAlign == CENTER) {
-                    int spaceBefore, spaceAfter;
-                    spaceBefore = (availableSpace - row[i].length()) / 2;
-                    spaceAfter = availableSpace - row[i].length() - spaceBefore;
-
-                    printSpaces(spaceBefore);
-                    app.getOutputStream().print(row[i]);
-                    printSpaces(spaceAfter);
-                    if (i < numCol - 1) {
-                        printSpaces(gap);
-                    }
-                } else {
-                    app.getOutputStream().print(row[i]);
-                    if (i < numCol - 1) {
-                        printSpaces(availableSpace - row[i].length() + gap);
-                    }
-                }
+    /** Provided the provided string data according to the provided width and the provided alignment. */
+    private String align(final String data, final Alignment alignment, final int width) {
+        final String rawData = data.trim();
+        final int padding = width - rawData.length();
 
-            }
-            app.getOutputStream().println("");
+        if (padding <= 0) {
+            return rawData;
+        }
+
+        switch (alignment) {
+        case RIGHT:
+            return pad(padding, rawData, 0);
+        case LEFT:
+            return pad(0, rawData, padding);
+        case CENTER:
+            final int paddingBefore = padding / 2;
+            return pad(paddingBefore, rawData, padding - paddingBefore);
+        default:
+            return "";
         }
-        printBorder();
     }
 
-    /**
-     * Set alignment for title strings.
-     *
-     * @param titleAlign
-     *            The alignment which should be one of {@code LEFT},
-     *            {@code RIGHT}, or {@code CENTER}.
-     */
-    public void setTitleAlign(final int titleAlign) {
-        this.titleAlign = titleAlign;
+    private String pad(final int leftPad, final String s, final int rightPad) {
+        return new StringBuilder().append(repeat(' ', leftPad))
+                                  .append(s)
+                                  .append(repeat(' ', rightPad))
+                                  .toString();
     }
 
-    private void printBorder() {
-        if (border == null) {
-            return;
+    private void passFirstSeparatorColumn() {
+        if (cursorOnLineStart()) {
+            consumeSeparatorColumn();
         }
+    }
 
-        // For the value in each column
-        for (int i = 0; i < numCol; i++) {
-            for (int j = 0; j < curLength[i]; j++) {
-                app.getOutputStream().print(border);
-            }
+    private void consumeSeparatorColumn() {
+        if (isSeparatorColumn(currentColumn)) {
+            stream.print('|' + columnSeparator);
+            nextLineOnEOLOrNextColumn();
         }
+    }
+
+    private void startNewLineIfNeeded() {
+        if (!cursorOnLineStart()) {
+            nextLine();
+        }
+    }
+
+    private void nextLineOnEOLOrNextColumn() {
+        if (columnIterator.hasNext()) {
+            currentColumn = columnIterator.next();
+            consumeSeparatorColumn();
+        } else {
+            nextLine();
+        }
+    }
+
+    private void nextLine() {
+        stream.println();
+        resetIterator();
+    }
+
+    private void resetIterator() {
+        columnIterator = columns.iterator();
+        currentColumn = columnIterator.next();
+    }
+
+    private boolean cursorOnLineStart() {
+        return currentColumn == columns.get(0);
+    }
+
+    private boolean isSeparatorColumn(final Column column) {
+        return column.id.startsWith(SEPARATOR_ID);
+    }
+
+    private void computePrintableColumns() {
+        printableColumns = new ArrayList<>(columns);
+        final Iterator it = printableColumns.iterator();
 
-        // For the gap between each column
-        for (int i = 0; i < numCol - 1; i++) {
-            for (int j = 0; j < gap; j++) {
-                app.getOutputStream().print(border);
+        while (it.hasNext()) {
+            if (isSeparatorColumn(it.next())) {
+                it.remove();
             }
         }
-        app.getOutputStream().println("");
     }
 
-    private void printSpaces(final int count) {
-        for (int i = 0; i < count; ++i) {
-            app.getOutputStream().print(" ");
+    private int computeLineLength() {
+        int lineLength = 0;
+        final int separatorLength = this.columnSeparator.length();
+        for (final Column column : this.columns) {
+            lineLength += column.width + separatorLength;
         }
+        return lineLength - separatorLength;
     }
 }
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index 8131b6cee..1b46c4b0f 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2006-2010 Sun Microsystems, Inc.
- *      Portions copyright 2014-2015 ForgeRock AS.
+ *      Portions copyright 2014-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.cli;
 
@@ -40,6 +40,7 @@
 import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.StringTokenizer;
 import java.util.TimeZone;
@@ -619,4 +620,19 @@ public static void printWrappedText(final PrintStream stream, final String messa
     public static void printWrappedText(final PrintStream stream, final LocalizableMessage message) {
         printWrappedText(stream, message != null ? message.toString() : null);
     }
+
+    /**
+     * Repeats the given {@link char} n times.
+     *
+     * @param charToRepeat
+     *      The {@link char} to repeat.
+     * @param length
+     *      The repetition count.
+     * @return The given {@link char} n times.
+     */
+    public static String repeat(final char charToRepeat, final int length) {
+        final char[] str = new char[length];
+        Arrays.fill(str, charToRepeat);
+        return new String(str);
+    }
 }
diff --git a/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt b/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
index d89259fc1..d136babfc 100644
--- a/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
+++ b/opendj-ldap-toolkit/legal-notices/THIRDPARTYREADME.txt
@@ -176,6 +176,95 @@ This License represents the complete agreement concerning subject matter hereof.
 As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
 
 
+***************************************************************************
+Apache Software License, Version 2.0
+***************************************************************************
+
+Version: jsr305.jar (3.0.0)
+Copyright: Copyright (c) 2005 Brian Goetz
+
+Version: metrics-core.jar (3.1.2)
+Copyright: Copyright (c) 2010-2014 Coda Hale, Yammer.com
+
+Version: hdrhistogram-metrics-reservoir.jar (1.1.0)
+Copyright: Copyright (c) 2014-2015 Marshall Pierce
+
+==================
+Full license text:
+==================
+
+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted. If You institute patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of this License; and
+You must cause any modified files to carry prominent notices stating that You changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+5. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work
+To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
 ***************************************************************************
 The MIT License (MIT)
 ***************************************************************************
@@ -211,3 +300,39 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
+
+
+***************************************************************************
+The BSD 2-Clause License
+***************************************************************************
+
+Version: HdrHistogram.jar (2.1.4)
+Copyright (c) 2012, 2013, 2014 Gil Tene
+Copyright (c) 2014 Michael Barker
+Copyright (c) 2014 Matt Warren
+
+==================
+Full license text:
+==================
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml
index 0e7e938cb..ae0ae2089 100644
--- a/opendj-ldap-toolkit/pom.xml
+++ b/opendj-ldap-toolkit/pom.xml
@@ -41,6 +41,17 @@
     jar
 
     
+        
+            io.dropwizard.metrics
+            metrics-core
+        
+
+        
+            org.mpierce.metrics.reservoir
+            hdrhistogram-metrics-reservoir
+            1.1.0
+        
+
         
             org.forgerock.opendj
             opendj-core
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
index 0123071c5..c9d0b18cb 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java
@@ -25,12 +25,13 @@
  */
 package com.forgerock.opendj.ldap.tools;
 
-import static java.util.Locale.ENGLISH;
+import static com.forgerock.opendj.cli.MultiColumnPrinter.column;
 import static java.util.concurrent.TimeUnit.*;
 
 import static org.forgerock.opendj.ldap.LdapException.*;
 import static org.forgerock.opendj.ldap.ResultCode.*;
-import static org.forgerock.opendj.ldap.requests.Requests.*;
+import static org.forgerock.opendj.ldap.requests.Requests.newAddRequest;
+import static org.forgerock.opendj.ldap.requests.Requests.newDeleteRequest;
 import static org.forgerock.util.promise.Promises.*;
 
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
@@ -40,12 +41,16 @@
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
 
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.RatioGauge;
+import com.forgerock.opendj.cli.MultiColumnPrinter;
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.Connection;
 import org.forgerock.opendj.ldap.ConnectionFactory;
@@ -91,9 +96,7 @@ private AddStatsHandler(final long currentTime, final String entryDN) {
             }
 
             @Override
-            public void handleResult(final Result result) {
-                super.handleResult(result);
-
+            void updateAdditionalStatsOnResult() {
                 switch (delStrategy) {
                 case RANDOM:
                     long newKey;
@@ -102,7 +105,7 @@ public void handleResult(final Result result) {
                     } while (dnEntriesAdded.putIfAbsent(newKey, entryDN) != null);
                     break;
                 case FIFO:
-                    long uniqueTime = currentTime;
+                    long uniqueTime = operationStartTimeNs;
                     while (dnEntriesAdded.putIfAbsent(uniqueTime, entryDN) != null) {
                         uniqueTime++;
                     }
@@ -111,9 +114,8 @@ public void handleResult(final Result result) {
                     break;
                 }
 
-                recentAdds.getAndIncrement();
-                totalAdds.getAndIncrement();
-                entryCount.getAndIncrement();
+                addCounter.inc();
+                entryCount.inc();
             }
         }
 
@@ -123,36 +125,37 @@ private DeleteStatsHandler(final long startTime) {
             }
 
             @Override
-            public void handleResult(final Result result) {
-                super.handleResult(result);
-                recentDeletes.getAndIncrement();
-                entryCount.getAndDecrement();
+            void updateAdditionalStatsOnResult() {
+                deleteCounter.inc();
+                entryCount.dec();
             }
         }
 
         private final class AddRateStatsThread extends StatsThread {
-            private final String[] extraColumn = new String[1];
+            private static final int PERCENTAGE_ADD_COLUMN_WIDTH = 6;
+            private static final String PERCENTAGE_ADD = STAT_ID_PREFIX + "add_percentage";
 
-            private AddRateStatsThread() {
-                super("Add%");
+            private AddRateStatsThread(final PerformanceRunner perfRunner, final ConsoleApplication app) {
+                super(perfRunner, app);
             }
 
             @Override
-            void resetStats() {
-                super.resetStats();
-                recentAdds.set(0);
-                recentDeletes.set(0);
+            void resetAdditionalStats() {
+                addCounter = newIntervalCounter();
+                deleteCounter = newIntervalCounter();
             }
 
             @Override
-            String[] getAdditionalColumns() {
-                final int adds = recentAdds.getAndSet(0);
-                final int deleteStat = recentDeletes.getAndSet(0);
-                final int total = adds + deleteStat;
-
-                extraColumn[0] = String.format(ENGLISH, "%.2f", total > 0 ? ((double) adds / total) * 100 : 0.0);
-
-                return extraColumn;
+            List registerAdditionalColumns() {
+                registry.register(PERCENTAGE_ADD, new RatioGauge() {
+                    @Override
+                    protected Ratio getRatio() {
+                        final long addIntervalCount = addCounter.refreshIntervalCount();
+                        final long deleteIntervalCount = deleteCounter.refreshIntervalCount();
+                        return Ratio.of(addIntervalCount * 100, addIntervalCount + deleteIntervalCount);
+                    }
+                });
+                return Collections.singletonList(column(PERCENTAGE_ADD, "Add%", PERCENTAGE_ADD_COLUMN_WIDTH, 2));
             }
         }
 
@@ -163,16 +166,16 @@ private AddDeleteWorkerThread(final Connection connection, final ConnectionFacto
 
             @Override
             public Promise performOperation(
-                    final Connection connection, final DataSource[] dataSources, final long currentTime) {
+                    final Connection connection, final DataSource[] dataSources, final long currentTimeNs) {
                 startPurgeIfMaxNumberAddReached();
-                startToggleDeleteIfAgeThresholdReached(currentTime);
+                startToggleDeleteIfAgeThresholdReached(currentTimeNs);
                 try {
                     String entryToRemove = getEntryToRemove();
                     if (entryToRemove != null) {
-                        return doDelete(connection, currentTime, entryToRemove);
+                        return doDelete(connection, currentTimeNs, entryToRemove);
                     }
 
-                    return doAdd(connection, currentTime);
+                    return doAdd(connection, currentTimeNs);
                 } catch (final AddRateExecutionEndedException a) {
                     return newResultPromise(OTHER);
                 } catch (final IOException e) {
@@ -185,14 +188,14 @@ private void startToggleDeleteIfAgeThresholdReached(long currentTime) {
                         && delThreshold == DeleteThreshold.AGE_THRESHOLD
                         && !dnEntriesAdded.isEmpty()
                         && dnEntriesAdded.firstKey() + timeToWait < currentTime) {
-                    setSizeThreshold(entryCount.get());
+                    setSizeThreshold(entryCount.getCount());
                 }
             }
 
             private void startPurgeIfMaxNumberAddReached() {
                 AtomicBoolean purgeLatch = new AtomicBoolean();
                 if (!isPurgeBranchRunning.get()
-                            && 0 < maxNbAddIterations && maxNbAddIterations < totalAdds.get()
+                            && 0 < maxNbAddIterations && maxNbAddIterations < addCounter.getCount()
                             && purgeLatch.compareAndSet(false, true)) {
                     newPurgerThread().start();
                 }
@@ -204,7 +207,7 @@ private void startPurgeIfMaxNumberAddReached() {
             private String getEntryToRemove() throws AddRateExecutionEndedException {
                 if (isPurgeBranchRunning.get()) {
                     return purgeEntry();
-                } else if (toggleDelete && entryCount.get() > sizeThreshold) {
+                } else if (toggleDelete && entryCount.getCount() > sizeThreshold) {
                     return removeFirstAddedEntry();
                 }
                 return null;
@@ -226,24 +229,22 @@ private String removeFirstAddedEntry() {
 
             private Promise doAdd(
                     final Connection connection, final long currentTime) throws IOException {
-                Entry entry;
+                final Entry entry;
                 synchronized (generator) {
                     entry = generator.readEntry();
                 }
 
                 final LdapResultHandler addHandler = new AddStatsHandler(
-                    currentTime, entry.getName().toString());
+                        currentTime, entry.getName().toString());
                 return connection.addAsync(newAddRequest(entry))
-                                 .thenOnResult(addHandler)
-                                 .thenOnException(addHandler);
+                                 .thenOnResultOrException(addHandler, addHandler);
             }
 
             private Promise doDelete(
                     final Connection connection, final long currentTime, final String entryToRemove) {
                 final LdapResultHandler deleteHandler = new DeleteStatsHandler(currentTime);
                 return connection.deleteAsync(newDeleteRequest(entryToRemove))
-                                 .thenOnResult(deleteHandler)
-                                 .thenOnException(deleteHandler);
+                                 .thenOnResultOrException(deleteHandler, deleteHandler);
             }
         }
 
@@ -280,15 +281,14 @@ protected Random initialValue() {
         private EntryGenerator generator;
         private DeleteStrategy delStrategy;
         private DeleteThreshold delThreshold;
-        private int sizeThreshold;
+        private long sizeThreshold;
         private volatile boolean toggleDelete;
         private long timeToWait;
         private int maxNbAddIterations;
         private boolean purgeEnabled;
-        private final AtomicInteger recentAdds = new AtomicInteger();
-        private final AtomicInteger recentDeletes = new AtomicInteger();
-        private final AtomicInteger totalAdds = new AtomicInteger();
-        private final AtomicInteger entryCount = new AtomicInteger();
+        private StatsThread.IntervalCounter addCounter = StatsThread.newIntervalCounter();
+        private StatsThread.IntervalCounter deleteCounter = StatsThread.newIntervalCounter();
+        private final Counter entryCount = new Counter();
         private final AtomicBoolean isPurgeBranchRunning = new AtomicBoolean();
 
         private AddPerformanceRunner(final PerformanceRunnerOptions options) throws ArgumentException {
@@ -302,13 +302,13 @@ WorkerThread newWorkerThread(final Connection connection, final ConnectionFactor
         }
 
         @Override
-        StatsThread newStatsThread() {
-            return new AddRateStatsThread();
+        StatsThread newStatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication app) {
+            return new AddRateStatsThread(performanceRunner, app);
         }
 
         @Override
-        TimerThread newEndTimerThread(final long timeTowait) {
-            return new AddRateTimerThread(timeTowait);
+        TimerThread newEndTimerThread(final long timeToWait) {
+            return new AddRateTimerThread(timeToWait);
         }
 
         TimerThread newPurgerThread() {
@@ -347,7 +347,7 @@ public void validate(final MultiChoiceArgument delModeArg,
             }
         }
 
-        private void setSizeThreshold(int entriesSizeThreshold) {
+        private void setSizeThreshold(final long entriesSizeThreshold) {
             sizeThreshold = entriesSizeThreshold;
             toggleDelete = true;
         }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index eb3816db3..582873ef8 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -27,17 +27,20 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.MultiColumnPrinter.column;
 import static com.forgerock.opendj.cli.Utils.*;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 import static com.forgerock.opendj.ldap.tools.Utils.*;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
-import java.util.concurrent.atomic.AtomicLong;
 
+import com.codahale.metrics.RatioGauge;
+import com.forgerock.opendj.cli.MultiColumnPrinter;
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.Connection;
 import org.forgerock.opendj.ldap.ConnectionFactory;
@@ -74,23 +77,37 @@
  * requests using one or more LDAP connections.
  */
 public final class AuthRate extends ConsoleApplication {
+
     private final class BindPerformanceRunner extends PerformanceRunner {
         private final class BindStatsThread extends StatsThread {
-            private final String[] extraColumn;
+            private static final int BIND_TIME_PERCENTAGE_COLUMN_WIDTH = 5;
+            private static final String BIND_TIME_PERCENTAGE = STAT_ID_PREFIX + "bind_time_percentage";
+
+            private final boolean computeBindTime;
 
-            private BindStatsThread(final boolean extraFieldRequired) {
-                super(extraFieldRequired ? new String[] { "bind time %" } : new String[0]);
-                extraColumn = new String[extraFieldRequired ? 1 : 0];
+            private BindStatsThread(final PerformanceRunner performanceRunner,
+                                    final ConsoleApplication app,
+                                    final boolean computeBindTime) {
+                super(performanceRunner, app);
+                this.computeBindTime = computeBindTime;
             }
 
             @Override
-            String[] getAdditionalColumns() {
-                if (extraColumn.length != 0) {
-                    final long searchWaitTimeNs = searchWaitRecentTimeNs.getAndSet(0);
-                    extraColumn[0] = getDivisionResult(
-                            100 * (intervalWaitTimeNs - searchWaitTimeNs), intervalWaitTimeNs, 1, "-");
+            List registerAdditionalColumns() {
+                if (!computeBindTime) {
+                    return Collections.emptyList();
                 }
-                return extraColumn;
+
+                registry.register(BIND_TIME_PERCENTAGE, new RatioGauge() {
+                    @Override
+                    protected Ratio getRatio() {
+                        final long searchWaitTimeIntervalNs = searchWaitRecentTimeNs.getLastIntervalCount();
+                        final long waitTimeIntervalNs = waitDurationNsCount.getLastIntervalCount();
+                        return Ratio.of(100 * (waitTimeIntervalNs - searchWaitTimeIntervalNs), waitTimeIntervalNs);
+                    }
+                });
+                return Collections.singletonList(
+                        column(BIND_TIME_PERCENTAGE, "bind time %", BIND_TIME_PERCENTAGE_COLUMN_WIDTH, 1));
             }
         }
 
@@ -113,7 +130,7 @@ private BindWorkerThread(final Connection connection, final ConnectionFactory co
 
             @Override
             public Promise performOperation(final Connection connection,
-                    final DataSource[] dataSources, final long startTime) {
+                    final DataSource[] dataSources, final long currentTimeNs) {
                 if (dataSources != null) {
                     data = DataSource.generateData(dataSources, data);
                     if (data.length == dataSources.length) {
@@ -144,7 +161,7 @@ public Promise performOperation(final Connection connection,
                                 @Override
                                 public Promise apply(SearchResultEntry result)
                                         throws LdapException {
-                                    searchWaitRecentTimeNs.getAndAdd(System.nanoTime() - startTime);
+                                    searchWaitRecentTimeNs.inc(System.nanoTime() - currentTimeNs);
                                     if (data == null) {
                                         data = new Object[1];
                                     }
@@ -158,8 +175,8 @@ public Promise apply(SearchResultEntry result)
                 }
 
                 incrementIterationCount();
-                return returnedPromise.thenOnResult(new UpdateStatsResultHandler(startTime))
-                                      .thenOnException(new UpdateStatsResultHandler(startTime));
+                return returnedPromise.thenOnResult(new UpdateStatsResultHandler(currentTimeNs))
+                                      .thenOnException(new UpdateStatsResultHandler(currentTimeNs));
             }
 
             private Promise performBind(final Connection connection,
@@ -288,7 +305,7 @@ private Promise performBind(final Connection connecti
             }
         }
 
-        private final AtomicLong searchWaitRecentTimeNs = new AtomicLong();
+        private final StatsThread.IntervalCounter searchWaitRecentTimeNs = StatsThread.newIntervalCounter();
         private String filter;
         private String baseDN;
         private SearchScope scope;
@@ -314,8 +331,8 @@ WorkerThread newWorkerThread(final Connection connection,
         }
 
         @Override
-        StatsThread newStatsThread() {
-            return new BindStatsThread(filter != null && baseDN != null);
+        StatsThread newStatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication app) {
+            return new BindStatsThread(performanceRunner, app, filter != null && baseDN != null);
         }
     }
 
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
index 52947ee79..85d499bb7 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java
@@ -22,7 +22,7 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2015 ForgeRock AS.
+ *      Portions Copyright 2011-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.ldap.tools;
 
@@ -67,12 +67,12 @@ private ModifyWorkerThread(final Connection connection,
 
             @Override
             public Promise performOperation(final Connection connection,
-                    final DataSource[] dataSources, final long startTime) {
+                    final DataSource[] dataSources, final long currentTimeNs) {
                 if (dataSources != null) {
                     data = DataSource.generateData(dataSources, data);
                 }
                 mr = newModifyRequest(data);
-                LdapResultHandler modRes = new UpdateStatsResultHandler<>(startTime);
+                LdapResultHandler modRes = new UpdateStatsResultHandler<>(currentTimeNs);
 
                 incrementIterationCount();
                 return connection.modifyAsync(mr).thenOnResult(modRes).thenOnException(modRes);
@@ -118,8 +118,8 @@ WorkerThread newWorkerThread(final Connection connection,
         }
 
         @Override
-        StatsThread newStatsThread() {
-            return new StatsThread(new String[0]);
+        StatsThread newStatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication app) {
+            return new StatsThread(performanceRunner, app);
         }
     }
 
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index f0d575d64..0e5ed7c1a 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -27,7 +27,6 @@
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage;
-import static java.util.Locale.ENGLISH;
 import static java.util.concurrent.TimeUnit.*;
 
 import static org.forgerock.util.Utils.*;
@@ -35,22 +34,9 @@
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 
 import java.io.IOException;
-import java.io.PrintStream;
-import java.lang.management.GarbageCollectorMXBean;
-import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map.Entry;
-import java.util.Queue;
-import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
 
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.Connection;
@@ -68,424 +54,12 @@
 import com.forgerock.opendj.cli.BooleanArgument;
 import com.forgerock.opendj.cli.ConsoleApplication;
 import com.forgerock.opendj.cli.IntegerArgument;
-import com.forgerock.opendj.cli.MultiColumnPrinter;
 import com.forgerock.opendj.cli.StringArgument;
 import com.forgerock.opendj.util.StaticUtils;
 
 /** Benchmark application framework. */
 abstract class PerformanceRunner implements ConnectionEventListener {
-    static final class ResponseTimeBuckets {
-        private static final long NS_1_US = NANOSECONDS.convert(1, MICROSECONDS);
-        private static final long NS_100_US = NANOSECONDS.convert(100, MICROSECONDS);
-        private static final long NS_1_MS = NANOSECONDS.convert(1, MILLISECONDS);
-        private static final long NS_10_MS = NANOSECONDS.convert(10, MILLISECONDS);
-        private static final long NS_100_MS = NANOSECONDS.convert(100, MILLISECONDS);
-        private static final long NS_1_S = NANOSECONDS.convert(1, SECONDS);
-        private static final long NS_5_S = NANOSECONDS.convert(5, SECONDS);
-
-        private static final int NB_INDEX = 2120;
-        private static final int RANGE_100_MICROSECONDS_START_INDEX = 1000;
-        private static final int RANGE_1_MILLISECOND_START_INDEX = 1090;
-        private static final int RANGE_100_MILLISECONDS_START_INDEX = 2080;
-
-        /**
-         * Array of response time buckets.
-         *
-         * 
-         * index    0 ->  999: 1000 buckets for    0ms -    1ms  interval with       1 µs increments
-         * index 1000 -> 1089:   90 buckets for    1ms -   10ms  interval with     100 µs increments
-         * index 1090 -> 2079:  990 buckets for   10ms - 1000ms  interval with    1000 µs increments
-         * index 2080 -> 2119:   40 buckets for 1000ms - 5000ms  interval with 100 000 µs increments
-         * 

-         */
-        private final AtomicLong[] index2Frequency = new AtomicLong[NB_INDEX];
-
-        /**
-         * Store the lower bounds (in microseconds) of the eTime buckets.
-         */
-        private final long[] index2Etime = new long[NB_INDEX];
-
-        /**
-         * Sorted map used for storing response times from 5s+ with 500 millisecond increments.
-         *
-         * Keys (Long in microseconds) of this map must respect this pattern: n * 500 000 + 5 000 000,
-         * where n is a natural integer.
-         */
-        private final ConcurrentSkipListMap bigEtimes = new ConcurrentSkipListMap<>();
-
-        /**
-         * Initialize both index2Frequency and index2Etime arrays.
-         */
-        private ResponseTimeBuckets() {
-            // Helpful variables to compute index2Etime values.
-            long rangeWidthMicroSecs;
-            long rangeStart = 0;
-            long initialTimeMicroSecs = 0;
-
-            for (int i = 0; i < NB_INDEX; i++) {
-                index2Frequency[i] = new AtomicLong();
-                if (i < RANGE_100_MICROSECONDS_START_INDEX) {
-                    // 0ms-1ms in 1 us increments
-                    rangeWidthMicroSecs = 1;
-                } else if (i < RANGE_1_MILLISECOND_START_INDEX) {
-                    // 1ms-10ms in 100 us increments
-                    rangeWidthMicroSecs = 100;
-                    rangeStart = RANGE_100_MICROSECONDS_START_INDEX;
-                    initialTimeMicroSecs = MICROSECONDS.convert(1, MILLISECONDS);
-                } else if (i < RANGE_100_MILLISECONDS_START_INDEX) {
-                    // 10ms-1000ms in 1000 us increments
-                    rangeWidthMicroSecs = MICROSECONDS.convert(1, MILLISECONDS);
-                    rangeStart = RANGE_1_MILLISECOND_START_INDEX;
-                    initialTimeMicroSecs = MICROSECONDS.convert(10, MILLISECONDS);
-                } else {
-                    // 1000ms-5000ms with 100 000 us increments
-                    rangeWidthMicroSecs = MICROSECONDS.convert(100, MILLISECONDS);
-                    rangeStart = RANGE_100_MILLISECONDS_START_INDEX;
-                    initialTimeMicroSecs = MICROSECONDS.convert(1, SECONDS);
-                }
-                index2Etime[i] = (i - rangeStart) * rangeWidthMicroSecs + initialTimeMicroSecs;
-            }
-        }
-
-        /**
-         * Compute the closest response time values for each percentile given in
-         * parameter. Percentiles array has to be sorted from lower to higher
-         * percentiles.
-         *
-         * @param percentiles
-         *            array of {@code double}
-         *
-         * @param nbData
-         *            number of response times recorded.
-         *
-         * @return array of response times in microseconds corresponding to
-         *         percentiles.
-         */
-        List getPercentile(double[] percentiles, long nbData) {
-            List responseTimes = new ArrayList<>();
-            Queue nbDataThresholds = new LinkedList<>();
-            long nbDataSum = nbData;
-
-            for (int i = percentiles.length - 1; i >= 0; i--) {
-                nbDataThresholds.add((long) (percentiles[i] * nbData) / 100);
-            }
-
-            Iterator> iter = bigEtimes.descendingMap().entrySet().iterator();
-            while (iter.hasNext() && !nbDataThresholds.isEmpty()) {
-                Entry currentETime = iter.next();
-                nbDataSum -= currentETime.getValue().get();
-                computePercentiles(nbDataThresholds, responseTimes, nbDataSum, currentETime.getKey());
-            }
-
-            int stdTimeIndex = NB_INDEX - 1;
-            while (stdTimeIndex >= 0 && !nbDataThresholds.isEmpty()) {
-                long currentETime = index2Etime[stdTimeIndex];
-                nbDataSum -= index2Frequency[stdTimeIndex].get();
-                computePercentiles(nbDataThresholds, responseTimes, nbDataSum, currentETime);
-                stdTimeIndex--;
-            }
-
-            return responseTimes;
-        }
-
-        private void computePercentiles(Queue currentDataThreshold, List responseTimes, long currentSum,
-                long currentETime) {
-            while (currentDataThreshold.peek() != null && currentDataThreshold.peek() >= currentSum) {
-                responseTimes.add(currentETime);
-                currentDataThreshold.poll();
-            }
-        }
-
-        void addTimeToInterval(long responseTimeNanoSecs) {
-            if (responseTimeNanoSecs >= NS_5_S) {
-                long matchingKey = responseTimeNanoSecs / NS_100_MS;
-                matchingKey -= matchingKey % 5;
-                matchingKey = matchingKey * MICROSECONDS.convert(100, MILLISECONDS);
-                // We now have a key corresponding to pattern 5 000 000 + n * 500 000 µs
-                AtomicLong existingKey = bigEtimes.putIfAbsent(matchingKey, new AtomicLong(1));
-                if (existingKey != null) {
-                    existingKey.getAndIncrement();
-                }
-                return;
-            }
-
-            final int startRangeIndex;
-            final long rangeWidthNanoSecs;
-            if (responseTimeNanoSecs < NS_1_MS) {
-                rangeWidthNanoSecs = NS_1_US;
-                startRangeIndex = 0;
-            } else if (responseTimeNanoSecs < NS_10_MS) {
-                rangeWidthNanoSecs = NS_100_US;
-                startRangeIndex = RANGE_100_MICROSECONDS_START_INDEX - 10;
-            } else if (responseTimeNanoSecs < NS_1_S) {
-                rangeWidthNanoSecs = NS_1_MS;
-                startRangeIndex = RANGE_1_MILLISECOND_START_INDEX - 10;
-            } else {
-                rangeWidthNanoSecs = NS_100_MS;
-                startRangeIndex = RANGE_100_MILLISECONDS_START_INDEX - 10;
-            }
-            final int intervalIndex = ((int) (responseTimeNanoSecs / rangeWidthNanoSecs)) + startRangeIndex;
-            index2Frequency[intervalIndex].getAndIncrement();
-        }
-    }
-
-    /** To allow tests. */
-    static ResponseTimeBuckets getResponseTimeBuckets() {
-        return new ResponseTimeBuckets();
-    }
-
-
-    /** Statistics thread base implementation. */
-    class StatsThread extends Thread {
-        protected long totalResultCount;
-        protected long totalOperationCount;
-        protected double totalDurationSec;
-        protected long totalWaitTimeNs;
-
-        protected int intervalSuccessCount;
-        protected int intervalOperationCount;
-        protected int intervalFailedCount;
-        protected double intervalDurationSec;
-        protected long intervalWaitTimeNs;
-
-        protected long lastStatTimeMs;
-        protected long lastGCDurationMs;
-
-        private final int numColumns;
-        private final String[] additionalColumns;
-        private final double[] percentiles;
-        private final List gcBeans;
-        private final boolean isScriptFriendly = app.isScriptFriendly();
-        private MultiColumnPrinter printer;
-
-
-        private long totalStatTimeMs;
-        private long gcDurationMs;
-
-        public StatsThread(final String... additionalColumns) {
-            super("Stats Thread");
-
-            this.additionalColumns = additionalColumns;
-            if (!percentilesArgument.isPresent()) {
-                this.percentiles = new double[] { 99.9, 99.99, 99.999 };
-            } else {
-                this.percentiles = new double[percentilesArgument.getValues().size()];
-                int index = 0;
-                for (final String percentile : percentilesArgument.getValues()) {
-                    percentiles[index++] = Double.parseDouble(percentile);
-                }
-                Arrays.sort(percentiles);
-            }
-
-            this.numColumns = 5 + this.percentiles.length + additionalColumns.length + (isAsync ? 1 : 0);
-            this.gcBeans = ManagementFactory.getGarbageCollectorMXBeans();
-        }
-
-        private void printResultsTitle() {
-            if (isScriptFriendly) {
-                printResultsTitleScriptFriendly();
-                return;
-            }
-
-            printer = new MultiColumnPrinter(numColumns, 2, "-", MultiColumnPrinter.RIGHT, app);
-            printer.setTitleAlign(MultiColumnPrinter.RIGHT);
-            printResultTitleHeaders();
-            printResultTitleDetails();
-        }
-
-        private void printResultTitleHeaders() {
-            final String[][] titleHeaders = new String[2][numColumns];
-            for (final String[] titleLine : titleHeaders) {
-                Arrays.fill(titleLine, "");
-            }
-
-            titleHeaders[0][0] = "Throughput";
-            titleHeaders[0][2] = "Response Time";
-
-            titleHeaders[1][0] = "(ops/second)";
-            titleHeaders[1][2] = "(milliseconds)";
-
-            final int[] span = new int[numColumns];
-            span[0] = 2;
-            span[1] = 0;
-            span[2] = 2 + this.percentiles.length;
-            Arrays.fill(span, 3, 4 + this.percentiles.length, 0);
-            Arrays.fill(span, 4 + this.percentiles.length, span.length, 1);
-
-            for (final String[] titleLine : titleHeaders) {
-                printer.addTitle(titleLine, span);
-            }
-        }
-
-        private void printResultTitleDetails() {
-            final String[] titleDetails = new String[numColumns];
-            titleDetails[0] = "recent";
-            titleDetails[1] = "average";
-            titleDetails[2] = "recent";
-            titleDetails[3] = "average";
-            int i = 4;
-            for (double percentile :percentiles) {
-                titleDetails[i++] = percentile + "%";
-            }
-            titleDetails[i++] = "err/sec";
-            if (isAsync) {
-                titleDetails[i++] = "req/res";
-            }
-            for (final String column : additionalColumns) {
-                titleDetails[i++] = column;
-            }
-
-            final int[] span = new int[numColumns];
-            Arrays.fill(span, 1);
-
-            printer.addTitle(titleDetails, span);
-            printer.printTitle();
-        }
-
-        private void printResultsTitleScriptFriendly() {
-            final PrintStream out = app.getOutputStream();
-            out.print("Time (seconds)");
-            out.print(",");
-            out.print("Recent throughput (ops/second)");
-            out.print(",");
-            out.print("Average throughput (ops/second)");
-            out.print(",");
-            out.print("Recent response time (milliseconds)");
-            out.print(",");
-            out.print("Average response time (milliseconds)");
-            for (final double percentile : this.percentiles) {
-                out.print(",");
-                out.print(percentile);
-                out.print("% response time (milliseconds)");
-            }
-            out.print(",");
-            out.print("Errors/second");
-            if (isAsync) {
-                out.print(",");
-                out.print("Requests/response");
-            }
-            for (final String column : additionalColumns) {
-                out.print(",");
-                out.print(column);
-            }
-            out.println();
-        }
-
-        private void printTitle() {
-            printResultsTitle();
-        }
-
-        private void initStats() {
-            totalStatTimeMs = System.currentTimeMillis();
-            gcDurationMs = getGCDuration();
-        }
-
-        @Override
-        public void run() {
-            lastStatTimeMs = totalStatTimeMs;
-            totalStatTimeMs = System.currentTimeMillis();
-
-            lastGCDurationMs = gcDurationMs;
-            gcDurationMs = getGCDuration();
-            final long gcIntervalDurationMs = gcDurationMs - lastGCDurationMs;
-
-            computeStatsForInterval(totalStatTimeMs, gcIntervalDurationMs);
-            final long intervalResultCount = intervalSuccessCount + intervalFailedCount;
-
-            final String[] printableStats = new String[numColumns];
-            Arrays.fill(printableStats, "-");
-            printableStats[0] = getDivisionResult(intervalResultCount, intervalDurationSec, 1);
-            printableStats[1] = getDivisionResult(totalResultCount, totalDurationSec, 1);
-
-            final long intervalWaitTimeMs = NANOSECONDS.toMillis(intervalWaitTimeNs) - gcIntervalDurationMs;
-            printableStats[2] = getDivisionResult(intervalWaitTimeMs, intervalResultCount, 3);
-
-            final long totalWaitTimeMs = NANOSECONDS.toMillis(totalWaitTimeNs) - gcDurationMs;
-            printableStats[3] = getDivisionResult(totalWaitTimeMs, totalResultCount, 3);
-
-            int i = 4;
-            final List computedPercentiles = eTimesBuckets.getPercentile(percentiles, totalOperationCount);
-            for (int j = computedPercentiles.size() - 1; j >= 0; j--) {
-                printableStats[i++] = getDivisionResult(computedPercentiles.get(j) , 1000.0, 2);
-            }
-            i = 4 + percentiles.length;
-            printableStats[i++] = intervalFailedCount == 0
-                                  ? "0.0"
-                                  : getDivisionResult(intervalFailedCount, intervalDurationSec, 1);
-            if (isAsync) {
-                printableStats[i++] = getDivisionResult(intervalOperationCount, intervalResultCount, 1);
-            }
-
-            for (final String column : getAdditionalColumns()) {
-                printableStats[i++] = column;
-            }
-
-            if (isScriptFriendly) {
-                printScriptFriendlyStats(printableStats);
-            } else {
-                printer.printRow(printableStats);
-            }
-        }
-
-        private void computeStatsForInterval(final long statTime, final long gcIntervalDurationMs) {
-            intervalOperationCount = operationRecentCount.getAndSet(0);
-            intervalSuccessCount = successRecentCount.getAndSet(0);
-            intervalFailedCount = failedRecentCount.getAndSet(0);
-            intervalWaitTimeNs = waitRecentTimeNs.getAndSet(0);
-
-            totalOperationCount += intervalOperationCount;
-            totalResultCount += intervalSuccessCount + intervalFailedCount;
-            totalWaitTimeNs += intervalWaitTimeNs;
-
-            final long intervalDurationMs = statTime - lastStatTimeMs;
-            intervalDurationSec = (intervalDurationMs - gcIntervalDurationMs) / 1000.0;
-            totalDurationSec += intervalDurationSec;
-        }
-
-        private long getGCDuration() {
-            long gcDuration = 0;
-            for (final GarbageCollectorMXBean bean : gcBeans) {
-                gcDuration += bean.getCollectionTime();
-            }
-
-            return gcDuration;
-        }
-
-        private String getDivisionResult(final long numerator, final double denominator, final int precision) {
-            return getDivisionResult(numerator, denominator, precision, "-");
-        }
-
-        protected String getDivisionResult(
-                final long numerator, final double denominator, final int precision, final String fallBack) {
-            return denominator > 0 ? String.format(ENGLISH, "%." + precision + "f", numerator / denominator)
-                                   : fallBack;
-        }
-
-        private void printScriptFriendlyStats(String[] printableStats) {
-            final PrintStream out = app.getOutputStream();
-            out.print(String.format(ENGLISH, "%.3f", totalDurationSec));
-            for (final String s : printableStats) {
-                out.print(",");
-                out.print(s);
-            }
-            out.println();
-        }
-
-        String[] getAdditionalColumns() {
-            return EMPTY_STRINGS;
-        }
-
-        /** Resets both general and recent statistic indicators. */
-        void resetStats() {
-            intervalFailedCount = 0;
-            intervalOperationCount = 0;
-            intervalSuccessCount = 0;
-            operationRecentCount.set(0);
-            successRecentCount.set(0);
-            failedRecentCount.set(0);
-            waitRecentTimeNs.set(0);
-        }
-    }
+    private static final double[] DEFAULT_PERCENTILES = new double[] { 99.9, 99.99, 99.999 };
 
     class TimerThread extends Thread {
         private final long timeToWait;
@@ -517,31 +91,31 @@ public void run() {
      *            The type of expected result.
      */
     class UpdateStatsResultHandler implements LdapResultHandler {
-        protected final long currentTime;
+        protected final long operationStartTimeNs;
 
-        UpdateStatsResultHandler(final long currentTime) {
-            this.currentTime = currentTime;
+        UpdateStatsResultHandler(final long currentTimeNs) {
+            this.operationStartTimeNs = currentTimeNs;
         }
 
         @Override
-        public void handleException(final LdapException exception) {
-            failedRecentCount.getAndIncrement();
-            updateStats();
+        public final void handleException(final LdapException exception) {
+            statsThread.incrementFailedCount();
+            updateResponseTime();
             app.errPrintVerboseMessage(LocalizableMessage.raw(exception.getResult().toString()));
         }
 
         @Override
-        public void handleResult(final S result) {
-            successRecentCount.getAndIncrement();
-            updateStats();
+        public final void handleResult(final S result) {
+            statsThread.incrementSuccessCount();
+            updateResponseTime();
+            updateAdditionalStatsOnResult();
         }
 
-        private void updateStats() {
-            if (!isWarmingUp) {
-                final long eTime = System.nanoTime() - currentTime;
-                waitRecentTimeNs.getAndAdd(eTime);
-                eTimesBuckets.addTimeToInterval(eTime);
-            }
+        /** Do nothing by default, child classes which manage additional stats need to override this method. */
+        void updateAdditionalStatsOnResult() { }
+
+        private void updateResponseTime() {
+            statsThread.addResponseTime(System.nanoTime() - operationStartTimeNs);
         }
     }
 
@@ -559,7 +133,7 @@ abstract class WorkerThread extends Thread {
         }
 
         public abstract Promise performOperation(
-                Connection connection, DataSource[] dataSources, long startTime);
+                Connection connection, DataSource[] dataSources, long currentTimeNs);
 
         @Override
         public void run() {
@@ -582,7 +156,7 @@ public void run() {
 
                 long startTimeNs = System.nanoTime();
                 promise = performOperation(connection, dataSources.get(), startTimeNs);
-                operationRecentCount.getAndIncrement();
+                statsThread.incrementOperationCount();
                 if (!isAsync) {
                     try {
                         promise.getOrThrow();
@@ -592,7 +166,7 @@ public void run() {
                     } catch (final LdapException e) {
                         if (!stopRequested && e.getCause() instanceof IOException) {
                             e.getCause().printStackTrace(app.getErrorStream());
-                            stopTool(e);
+                            stopTool(true);
                             break;
                         }
                         // Ignore. Handled by result handler
@@ -638,14 +212,6 @@ void incrementIterationCount() {
         }
     }
 
-    private static final String[] EMPTY_STRINGS = new String[0];
-    private final AtomicInteger operationRecentCount = new AtomicInteger();
-    protected final AtomicInteger successRecentCount = new AtomicInteger();
-    protected final AtomicInteger failedRecentCount = new AtomicInteger();
-    private final AtomicLong waitRecentTimeNs = new AtomicLong();
-    private final ResponseTimeBuckets eTimesBuckets = new ResponseTimeBuckets();
-
-
     private final ConsoleApplication app;
     private DataSource[] dataSourcePrototypes;
 
@@ -669,13 +235,12 @@ protected DataSource[] initialValue() {
     int numConnections;
     private boolean stopRequested;
 
-    private volatile boolean isWarmingUp;
     private int targetThroughput;
     private int maxIterations;
     /** Warm-up duration time in ms. **/
-    private long warmUpDuration;
+    private long warmUpDurationMs;
     /** Max duration time in ms, 0 for unlimited. **/
-    private long maxDurationTime;
+    private long maxDurationTimeMs;
     private boolean isAsync;
     private boolean noRebind;
     private BindRequest bindRequest;
@@ -694,8 +259,7 @@ protected DataSource[] initialValue() {
     protected final IntegerArgument warmUpArgument;
 
     private final List workerThreads = new ArrayList<>();
-    private final ScheduledExecutorService statThreadScheduler = Executors.newSingleThreadScheduledExecutor();
-    private StatsThread statsThread;
+    StatsThread statsThread;
 
     PerformanceRunner(final PerformanceRunnerOptions options) throws ArgumentException {
         ArgumentParser argParser = options.getArgumentParser();
@@ -816,11 +380,11 @@ public void handleConnectionClosed() {
     @Override
     public synchronized void handleConnectionError(final boolean isDisconnectNotification, final LdapException error) {
         if (!stopRequested) {
-            app.errPrintln(ERROR_RATE_TOOLS_CAN_NOT_GET_CONNECTION.get(error.getMessage()));
+            app.errPrintln(ERROR_RATE_TOOLS_CANNOT_GET_CONNECTION.get(error.getMessage()));
             if (error.getCause() != null && app.isVerbose()) {
                 error.getCause().printStackTrace(app.getErrorStream());
             }
-            stopTool(error);
+            stopTool(true);
         }
     }
 
@@ -832,9 +396,9 @@ public void handleUnsolicitedNotification(final ExtendedResult notification) {
     public final void validate() throws ArgumentException {
         numConnections = numConnectionsArgument.getIntValue();
         numThreads = numThreadsArgument.getIntValue();
-        warmUpDuration = warmUpArgument.getIntValue() * 1000L;
+        warmUpDurationMs = warmUpArgument.getIntValue() * 1000L;
         maxIterations = maxIterationsArgument.getIntValue() / numConnections / numThreads;
-        maxDurationTime = maxDurationArgument.getIntValue() * 1000L;
+        maxDurationTimeMs = maxDurationArgument.getIntValue() * 1000L;
         statsIntervalMs = statsIntervalArgument.getIntValue() * 1000;
         targetThroughput = targetThroughputArgument.getIntValue();
 
@@ -868,19 +432,18 @@ final DataSource[] getDataSources() {
     }
 
     abstract WorkerThread newWorkerThread(final Connection connection, final ConnectionFactory connectionFactory);
-    abstract StatsThread newStatsThread();
+    abstract StatsThread newStatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication app);
 
-    TimerThread newEndTimerThread(final long timeTowait) {
-        return new TimerThread(timeTowait);
+    TimerThread newEndTimerThread(final long timeToWait) {
+        return new TimerThread(timeToWait);
     }
 
     final int run(final ConnectionFactory connectionFactory) {
         final List connections = new ArrayList<>();
+        statsThread = newStatsThread(this, app);
 
         try {
             validateCanConnectToServer(connectionFactory);
-
-            isWarmingUp = warmUpDuration > 0;
             for (int i = 0; i < numConnections; i++) {
                 Connection connection = null;
                 if (keepConnectionsOpen.isPresent() || noRebindArgument.isPresent()) {
@@ -895,30 +458,17 @@ final int run(final ConnectionFactory connectionFactory) {
                 }
             }
 
-            if (maxDurationTime > 0) {
-                newEndTimerThread(maxDurationTime).start();
+            if (maxDurationTimeMs > 0) {
+                newEndTimerThread(maxDurationTimeMs).start();
             }
 
-            statsThread = newStatsThread();
-            if (isWarmingUp) {
-                if (!app.isScriptFriendly()) {
-                    app.println(INFO_TOOL_WARMING_UP.get(warmUpDuration / 1000));
-                }
-                Thread.sleep(warmUpDuration);
-                statsThread.resetStats();
-                isWarmingUp = false;
-            }
-
-            statsThread.printTitle();
-            statsThread.initStats();
-            statThreadScheduler.scheduleAtFixedRate(
-                    statsThread, statsIntervalMs, statsIntervalMs, TimeUnit.MILLISECONDS);
+            statsThread.startReporting();
             joinAllWorkerThreads();
             stopTool();
         } catch (final InterruptedException e) {
-            stopTool(e);
+            stopTool(true);
         } catch (final LdapException e) {
-            stopTool(e);
+            stopTool(true);
             printErrorMessage(app, e);
             return e.getResult().getResultCode().intValue();
         } finally {
@@ -935,22 +485,13 @@ private void validateCanConnectToServer(ConnectionFactory connectionFactory) thr
     }
 
     synchronized void stopTool() {
-        stopTool(null);
+        stopTool(false);
     }
 
-    synchronized void stopTool(final Exception e) {
+    synchronized void stopTool(final boolean stoppedByError) {
         if (!stopRequested) {
             stopRequested = true;
-            statThreadScheduler.shutdown();
-            if (e == null) {
-                // If stats thread is printing stats, wait for it to finish.
-                try {
-                    statThreadScheduler.awaitTermination(50, TimeUnit.MILLISECONDS);
-                } catch (InterruptedException ignored) {
-                    // Do nothing.
-                }
-                statsThread.run();
-            }
+            statsThread.stopRecording(stoppedByError);
         }
     }
 
@@ -958,13 +499,35 @@ void setBindRequest(final BindRequest request) {
         this.bindRequest = request;
     }
 
-    BindRequest getBindRequest() {
-        return bindRequest;
-    }
-
     protected void joinAllWorkerThreads() throws InterruptedException {
         for (final Thread t : workerThreads) {
             t.join();
         }
     }
+
+    boolean isAsync() {
+        return isAsync;
+    }
+
+    double[] getPercentiles() {
+        if (percentilesArgument.isPresent()) {
+            double[] percentiles = new double[percentilesArgument.getValues().size()];
+            int index = 0;
+            for (final String percentile : percentilesArgument.getValues()) {
+                percentiles[index++] = Double.parseDouble(percentile);
+            }
+            Arrays.sort(percentiles);
+            return percentiles;
+        }
+
+        return DEFAULT_PERCENTILES;
+    }
+
+    long getWarmUpDurationMs() {
+        return warmUpDurationMs;
+    }
+
+    long getStatsInterval() {
+        return statsIntervalMs;
+    }
 }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
index 509d33880..f6d783136 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java
@@ -22,19 +22,22 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2015 ForgeRock AS.
+ *      Portions Copyright 2011-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.ldap.tools;
 
 import static com.forgerock.opendj.cli.ArgumentConstants.*;
+import static com.forgerock.opendj.cli.MultiColumnPrinter.column;
 import static com.forgerock.opendj.cli.Utils.*;
 import static com.forgerock.opendj.ldap.tools.ToolsMessages.*;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
 
+import com.codahale.metrics.RatioGauge;
+import com.forgerock.opendj.cli.MultiColumnPrinter;
 import org.forgerock.i18n.LocalizableMessage;
 import org.forgerock.opendj.ldap.Connection;
 import org.forgerock.opendj.ldap.ConnectionFactory;
@@ -65,15 +68,14 @@
  */
 public final class SearchRate extends ConsoleApplication {
     private final class SearchPerformanceRunner extends PerformanceRunner {
-        private final class SearchStatsHandler extends UpdateStatsResultHandler implements
-                SearchResultHandler {
+        private final class SearchStatsHandler extends UpdateStatsResultHandler implements SearchResultHandler {
             private SearchStatsHandler(final long startTime) {
                 super(startTime);
             }
 
             @Override
             public boolean handleEntry(final SearchResultEntry entry) {
-                entryRecentCount.getAndIncrement();
+                entryCount.inc();
                 return true;
             }
 
@@ -84,23 +86,28 @@ public boolean handleReference(final SearchResultReference reference) {
         }
 
         private final class SearchStatsThread extends StatsThread {
-            private final String[] extraColumn = new String[1];
+            private static final int ENTRIES_PER_SEARCH_COLUMN_WIDTH = 5;
+            private static final String ENTRIES_PER_SEARCH = STAT_ID_PREFIX + "entries_per_search";
 
-            private SearchStatsThread() {
-                super("Entries/Srch");
+            private SearchStatsThread(final PerformanceRunner perfRunner, final ConsoleApplication app) {
+                super(perfRunner, app);
             }
 
             @Override
-            void resetStats() {
-                super.resetStats();
-                entryRecentCount.set(0);
+            void resetAdditionalStats() {
+                entryCount = newIntervalCounter();
             }
 
             @Override
-            String[] getAdditionalColumns() {
-                final int entryCount = entryRecentCount.getAndSet(0);
-                extraColumn[0] = getDivisionResult(entryCount, intervalSuccessCount, 1, "0.0");
-                return extraColumn;
+            List registerAdditionalColumns() {
+                registry.register(ENTRIES_PER_SEARCH, new RatioGauge() {
+                    @Override
+                    protected Ratio getRatio() {
+                        return Ratio.of(entryCount.refreshIntervalCount(), successCount.getLastIntervalCount());
+                    }
+                });
+                return Collections.singletonList(
+                        column(ENTRIES_PER_SEARCH, "Entries/Srch", ENTRIES_PER_SEARCH_COLUMN_WIDTH, 1));
             }
         }
 
@@ -115,7 +122,7 @@ private SearchWorkerThread(final Connection connection,
 
             @Override
             public Promise performOperation(final Connection connection,
-                    final DataSource[] dataSources, final long startTime) {
+                    final DataSource[] dataSources, final long currentTimeNs) {
                 if (sr == null) {
                     if (dataSources == null) {
                         sr = Requests.newSearchRequest(baseDN, scope, filter, attributes);
@@ -132,7 +139,7 @@ public Promise performOperation(final Connection connection,
                     sr.setName(String.format(baseDN, data));
                 }
 
-                final SearchStatsHandler handler = new SearchStatsHandler(startTime);
+                final SearchStatsHandler handler = new SearchStatsHandler(currentTimeNs);
                 incrementIterationCount();
                 return connection.searchAsync(sr, handler).thenOnResult(handler).thenOnException(handler);
             }
@@ -156,8 +163,8 @@ WorkerThread newWorkerThread(final Connection connection,
         }
 
         @Override
-        StatsThread newStatsThread() {
-            return new SearchStatsThread();
+        StatsThread newStatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication app) {
+            return new SearchStatsThread(performanceRunner, app);
         }
     }
 
@@ -167,17 +174,14 @@ StatsThread newStatsThread() {
      * @param args
      *            The command-line arguments provided to this program.
      */
-
     public static void main(final String[] args) {
         final int retCode = new SearchRate().run(args);
         System.exit(filterExitCode(retCode));
     }
 
     private BooleanArgument verbose;
-
     private BooleanArgument scriptFriendly;
-
-    private final AtomicInteger entryRecentCount = new AtomicInteger();
+    private StatsThread.IntervalCounter entryCount = StatsThread.newIntervalCounter();
 
     private SearchRate() {
         // Nothing to do.
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
new file mode 100644
index 000000000..6d35ff8b1
--- /dev/null
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
@@ -0,0 +1,446 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * Common Development and Distribution License, Version 1.0 only
+ * (the "License").  You may not use this file except in compliance
+ * with the License.
+ *
+ * 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 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 2016 ForgeRock AS.
+ */
+package com.forgerock.opendj.ldap.tools;
+
+import static com.forgerock.opendj.cli.MultiColumnPrinter.column;
+import static com.forgerock.opendj.cli.MultiColumnPrinter.separatorColumn;
+import static com.forgerock.opendj.ldap.tools.ToolsMessages.INFO_TOOL_WARMING_UP;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.SortedMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricFilter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.RatioGauge;
+import com.codahale.metrics.ScheduledReporter;
+import com.codahale.metrics.Timer;
+import com.forgerock.opendj.cli.ConsoleApplication;
+import com.forgerock.opendj.cli.MultiColumnPrinter;
+import org.mpierce.metrics.reservoir.hdrhistogram.HdrHistogramReservoir;
+
+/**
+ * Statistics thread base implementation.
+ * 

+ * The goal of this class is to compute and print rate tool general statistics.
+ */
+class StatsThread extends Thread {
+
+    static final String STAT_ID_PREFIX = "org.forgerock.opendj.";
+
+    private static final String TIME_NOW = STAT_ID_PREFIX + "current_time";
+    private static final String RECENT_THROUGHPUT = STAT_ID_PREFIX + "recent_throughput";
+    private static final String AVERAGE_THROUGHPUT = STAT_ID_PREFIX + "average_throughput";
+    private static final String RECENT_RESPONSE_TIME_MS = STAT_ID_PREFIX + "recent_response_time";
+    private static final String AVERAGE_RESPONSE_TIME_MS = STAT_ID_PREFIX + "average_response_time";
+    private static final String PERCENTILES = STAT_ID_PREFIX + "percentiles";
+    private static final String ERROR_PER_SECOND = STAT_ID_PREFIX + "error_per_second";
+    private static final String REQUEST_PER_RESPONSE = STAT_ID_PREFIX + "request_per_response";
+
+    public static final double MS_IN_S = TimeUnit.SECONDS.toMillis(1);
+    public static final double NS_IN_MS = TimeUnit.MILLISECONDS.toNanos(1);
+
+    private abstract class RateReporter extends ScheduledReporter {
+        final MultiColumnPrinter printer;
+
+        private RateReporter() {
+            super(registry, "", MetricFilter.ALL, TimeUnit.SECONDS, TimeUnit.MILLISECONDS);
+            printer = createPrinter();
+        }
+
+        abstract MultiColumnPrinter createPrinter();
+        abstract void printTitle();
+
+        @Override
+        @SuppressWarnings({ "rawtypes", "unchecked" })
+        public void report(final SortedMap gauges,
+                           final SortedMap counters,
+                           final SortedMap histograms,
+                           final SortedMap meters,
+                           final SortedMap timers) {
+            int percentileIndex = 0;
+            for (final MultiColumnPrinter.Column column : printer.getColumns()) {
+                final String statKey = column.getId();
+                if (gauges.containsKey(statKey)) {
+                    printer.printData(((Gauge) gauges.get(statKey)).getValue());
+                } else if (statKey.startsWith(PERCENTILES)) {
+                    final double quantile = percentiles[percentileIndex++] / 100.0;
+                    printer.printData(
+                            histograms.get(PERCENTILES).getSnapshot().getValue(quantile) / MILLISECONDS.toNanos(1));
+                } else {
+                    printer.printData("-");
+                }
+            }
+        }
+    }
+
+    private final class ConsoleRateReporter extends RateReporter {
+        private static final int STANDARD_WIDTH = 8;
+        private List additionalColumns;
+
+        @Override
+        void printTitle() {
+            final int throughputRawSpan = 2;
+            final int responseTimeRawSpan = 2 + percentiles.length;
+            final int additionalStatsRawSpan = 1 + (performanceRunner.isAsync() ? 1 : 0) + additionalColumns.size();
+
+            printer.printDashedLine();
+            printer.printTitleSection("Throughput", throughputRawSpan);
+            printer.printTitleSection("Response Time", responseTimeRawSpan);
+            printer.printTitleSection(additionalStatsRawSpan > 1 ? "Additional" : "", additionalStatsRawSpan);
+            printer.printTitleSection("(ops/second)", throughputRawSpan);
+            printer.printTitleSection("(milliseconds)", responseTimeRawSpan);
+            printer.printTitleSection(additionalStatsRawSpan > 1 ? "Statistics" : "", additionalStatsRawSpan);
+            printer.printTitleLine();
+            printer.printDashedLine();
+        }
+
+        @Override
+        MultiColumnPrinter createPrinter() {
+            final List columns = new ArrayList<>();
+            // Throughput (ops/sec)
+            columns.add(separatorColumn());
+            columns.add(column(RECENT_THROUGHPUT, "recent", STANDARD_WIDTH, 1));
+            columns.add(column(AVERAGE_THROUGHPUT, "average", STANDARD_WIDTH, 1));
+            // Response Time (ms)
+            columns.add(separatorColumn());
+            columns.add(column(RECENT_RESPONSE_TIME_MS, "recent", STANDARD_WIDTH, 3));
+            columns.add(column(AVERAGE_RESPONSE_TIME_MS, "average", STANDARD_WIDTH, 3));
+            for (double percentile : percentiles) {
+                columns.add(column(PERCENTILES + percentile, percentile + "%", STANDARD_WIDTH, 2));
+            }
+            // Additional stats
+            columns.add(separatorColumn());
+            columns.add(column(ERROR_PER_SECOND, "err/sec", STANDARD_WIDTH, 1));
+            if (performanceRunner.isAsync()) {
+                columns.add(separatorColumn());
+                columns.add(column(REQUEST_PER_RESPONSE, "req/res", 4, 1));
+            }
+            additionalColumns = registerAdditionalColumns();
+            if (!additionalColumns.isEmpty()) {
+                columns.addAll(additionalColumns);
+            }
+            columns.add(separatorColumn());
+
+
+            return MultiColumnPrinter.builder(app.getOutputStream(), columns)
+                    .format(true)
+                    .titleAlignment(MultiColumnPrinter.Alignment.CENTER)
+                    .build();
+        }
+    }
+
+    private final class CsvRateReporter extends RateReporter {
+        @Override
+        void printTitle() {
+            printer.printTitleLine();
+        }
+
+        @Override
+        MultiColumnPrinter createPrinter() {
+            final List columns = new ArrayList<>();
+            columns.add(column(TIME_NOW, "time", 3));
+            columns.add(column(RECENT_THROUGHPUT, "recent throughput", 1));
+            columns.add(column(AVERAGE_THROUGHPUT, "average throughput", 1));
+            columns.add(column(RECENT_RESPONSE_TIME_MS, "recent response time", 3));
+            columns.add(column(AVERAGE_RESPONSE_TIME_MS, "average response time", 3));
+            for (double percentile : percentiles) {
+                columns.add(column(
+                        PERCENTILES + percentile, percentile + "% response time", 2));
+            }
+            columns.add(column(ERROR_PER_SECOND, "errors/second", 1));
+            if (performanceRunner.isAsync()) {
+                columns.add(column(REQUEST_PER_RESPONSE, "Requests/response", 1));
+            }
+            columns.addAll(registerAdditionalColumns());
+
+
+            return MultiColumnPrinter.builder(app.getOutputStream(), columns)
+                    .columnSeparator(",")
+                    .build();
+        }
+    }
+
+    /** A timer to prevent adding temporary variables in {@link StatsThread#run()}. **/
+    private static abstract class StatsTimer {
+        private long startTimeMeasure;
+        private long elapsed;
+
+        abstract long getInstantTime();
+
+        private void start() {
+            startTimeMeasure = getInstantTime();
+        }
+
+        private long reset() {
+            final long time = getInstantTime();
+            elapsed = time - this.startTimeMeasure;
+            this.startTimeMeasure = time;
+
+            return elapsed;
+        }
+
+        private long elapsed() {
+            return elapsed;
+        }
+    }
+
+    /** A counter to prevent adding temporary variables in {@link StatsThread#run()}. **/
+    static final class IntervalCounter extends Counter {
+        private long lastIntervalCount;
+        private long lastTotalCount;
+
+        long refreshIntervalCount() {
+            final long totalCount = getCount();
+            lastIntervalCount = totalCount - lastTotalCount;
+            lastTotalCount = totalCount;
+            return lastIntervalCount;
+        }
+
+        long getLastIntervalCount() {
+            return lastIntervalCount;
+        }
+
+        long getLastTotalCount() {
+            return lastTotalCount;
+        }
+    }
+
+    static final IntervalCounter newIntervalCounter() {
+        return new IntervalCounter();
+    }
+
+
+    final MetricRegistry registry = new MetricRegistry();
+    private final Histogram responseTimes = new Histogram(new HdrHistogramReservoir());
+
+    private final StatsTimer gcTimerMs = new StatsTimer() {
+        private final List gcBeans = ManagementFactory.getGarbageCollectorMXBeans();
+
+        @Override
+        long getInstantTime() {
+            long gcDurationMs = 0;
+            for (final GarbageCollectorMXBean bean : gcBeans) {
+                gcDurationMs += bean.getCollectionTime();
+            }
+
+            return gcDurationMs;
+        }
+    };
+
+    private final StatsTimer timerMs = new StatsTimer() {
+        @Override
+        long getInstantTime() {
+            return System.currentTimeMillis();
+        }
+    };
+
+    IntervalCounter waitDurationNsCount;
+    IntervalCounter successCount;
+    private IntervalCounter operationCount;
+    private IntervalCounter errorCount;
+    private IntervalCounter durationMsCount;
+
+    private final ConsoleApplication app;
+    private final double[] percentiles;
+    private final PerformanceRunner performanceRunner;
+    private final RateReporter reporter;
+    private long startTimeMs;
+    private volatile boolean warmingUp;
+    private final ScheduledExecutorService statThreadScheduler = Executors.newSingleThreadScheduledExecutor();
+
+    StatsThread(final PerformanceRunner performanceRunner, final ConsoleApplication application) {
+        super("Stats Thread");
+        resetStats();
+        this.performanceRunner = performanceRunner;
+        this.app = application;
+        this.percentiles = performanceRunner.getPercentiles();
+        this.reporter = app.isScriptFriendly() ? new CsvRateReporter()
+                                               : new ConsoleRateReporter();
+        registerStats();
+    }
+
+    /** Resets both general and recent statistic indicators. */
+    final void resetStats() {
+        errorCount = newIntervalCounter();
+        operationCount = newIntervalCounter();
+        successCount = newIntervalCounter();
+        waitDurationNsCount = newIntervalCounter();
+        durationMsCount = newIntervalCounter();
+        resetAdditionalStats();
+    }
+
+    private void registerStats() {
+        if (app.isScriptFriendly()) {
+            registry.register(TIME_NOW, new RatioGauge() {
+                @Override
+                protected Ratio getRatio() {
+                    return Ratio.of(System.currentTimeMillis() - startTimeMs, MS_IN_S);
+                }
+            });
+        }
+
+        registry.register(RECENT_THROUGHPUT, new RatioGauge() {
+            @Override
+            protected Ratio getRatio() {
+                return Ratio.of(successCount.getLastIntervalCount() + errorCount.getLastIntervalCount(),
+                                durationMsCount.getLastIntervalCount() / MS_IN_S);
+            }
+        });
+
+        registry.register(AVERAGE_THROUGHPUT, new RatioGauge() {
+            @Override
+            protected Ratio getRatio() {
+                return Ratio.of(successCount.getLastTotalCount() + errorCount.getLastTotalCount(),
+                                durationMsCount.getLastTotalCount() / MS_IN_S);
+            }
+        });
+
+        registry.register(RECENT_RESPONSE_TIME_MS, new RatioGauge() {
+            @Override
+            protected Ratio getRatio() {
+                return Ratio.of((waitDurationNsCount.getLastIntervalCount() / NS_IN_MS) - gcTimerMs.elapsed(),
+                                successCount.getLastIntervalCount() + errorCount.getLastIntervalCount());
+            }
+        });
+
+        registry.register(AVERAGE_RESPONSE_TIME_MS, new RatioGauge() {
+            @Override
+            protected Ratio getRatio() {
+                return Ratio.of((waitDurationNsCount.getLastTotalCount() / NS_IN_MS) - gcTimerMs.getInstantTime(),
+                                 successCount.getLastTotalCount() + errorCount.getLastTotalCount());
+            }
+        });
+
+        registry.register(ERROR_PER_SECOND, new RatioGauge() {
+            @Override
+            protected Ratio getRatio() {
+                return Ratio.of(errorCount.getLastIntervalCount(), durationMsCount.getLastIntervalCount() / MS_IN_S);
+            }
+        });
+
+        if (performanceRunner.isAsync()) {
+            registry.register(REQUEST_PER_RESPONSE, new RatioGauge() {
+                @Override
+                protected Ratio getRatio() {
+                    return Ratio.of(operationCount.getLastIntervalCount(),
+                            successCount.getLastIntervalCount() + errorCount.getLastIntervalCount());
+                }
+            });
+        }
+        registry.register(PERCENTILES, responseTimes);
+    }
+
+    void startReporting() throws InterruptedException {
+        warmUp();
+        init();
+        final long statsIntervalMs = performanceRunner.getStatsInterval();
+        statThreadScheduler.scheduleAtFixedRate(this, statsIntervalMs, statsIntervalMs, TimeUnit.MILLISECONDS);
+    }
+
+    private void warmUp() throws InterruptedException {
+        final long warmUpDurationMs = performanceRunner.getWarmUpDurationMs();
+        if (warmUpDurationMs > 0) {
+            if (!app.isScriptFriendly()) {
+                app.println(INFO_TOOL_WARMING_UP.get(warmUpDurationMs / TimeUnit.SECONDS.toMillis(1)));
+            }
+            Thread.sleep(warmUpDurationMs);
+            resetStats();
+        }
+        warmingUp = false;
+    }
+
+    private void init() {
+        reporter.printTitle();
+        timerMs.start();
+        gcTimerMs.start();
+        startTimeMs = System.currentTimeMillis();
+    }
+
+    public void stopRecording(final boolean stoppedByError) {
+        statThreadScheduler.shutdown();
+        if (!stoppedByError) {
+            // If stats thread is printing stats, wait for it to finish and print a last line of stats.
+            try {
+                statThreadScheduler.awaitTermination(50, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException ignored) {
+                // Do nothing.
+            }
+            run();
+        }
+    }
+
+    /** Performs stat snapshots and reports results to application. */
+    @Override
+    public void run() {
+        durationMsCount.inc(timerMs.reset() - gcTimerMs.reset());
+        durationMsCount.refreshIntervalCount();
+        operationCount.refreshIntervalCount();
+        successCount.refreshIntervalCount();
+        errorCount.refreshIntervalCount();
+        waitDurationNsCount.refreshIntervalCount();
+
+        reporter.report();
+    }
+
+    void addResponseTime(final long responseTimeNs) {
+        if (!warmingUp) {
+            waitDurationNsCount.inc(responseTimeNs);
+            responseTimes.update(responseTimeNs);
+        }
+    }
+
+    void incrementFailedCount() {
+        errorCount.inc();
+    }
+
+    void incrementSuccessCount() {
+        successCount.inc();
+    }
+
+    void incrementOperationCount() {
+        operationCount.inc();
+    }
+
+    /** Child classes which manage additional stats need to override this method. */
+    List registerAdditionalColumns() {
+        return Collections.emptyList();
+    }
+
+    /** Do nothing by default, child classes which manage additional stats need to override this method. */
+    void resetAdditionalStats() { }
+}
diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index d318ea6bc..e9c2edd9c 100755
--- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -138,7 +138,7 @@ INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage:  java %s  {options}
 INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage:  %s  {options}
 INFO_ARGPARSER_USAGE_TRAILINGARGS={trailing-arguments}
 INFO_ARGPARSER_USAGE_DEFAULT_VALUE=Default value: %s
-ERROR_RATE_TOOLS_CAN_NOT_GET_CONNECTION=%s\nThe tool is going to stop.
+ERROR_RATE_TOOLS_CANNOT_GET_CONNECTION=%s\nStopping...
 #
 # Extension messages
 #
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java
index 68f7622c6..0754977f5 100644
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java
+++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java
@@ -40,7 +40,7 @@
 @SuppressWarnings("javadoc")
 public class AuthRateITCase extends ToolsITCase {
 
-    private static final String THROUGHPUT_TEXT = "Recent throughput (ops/second)";
+    private static final String THROUGHPUT_TEXT = "recent throughput";
 
     @DataProvider
     public Object[][] authRateArgs() throws Exception {
diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java
deleted file mode 100644
index b95ee59ea..000000000
--- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerStatsTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
- *
- * 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 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 2014 ForgeRock AS.
- */
-package com.forgerock.opendj.ldap.tools;
-
-import org.testng.annotations.Test;
-
-import com.forgerock.opendj.ldap.tools.PerformanceRunner.ResponseTimeBuckets;
-
-import static org.fest.assertions.Assertions.*;
-
-public class PerformanceRunnerStatsTestCase extends ToolsTestCase {
-    @Test
-    public void testResponseTimeBuckets() throws Exception {
-        ResponseTimeBuckets rtb = PerformanceRunner.getResponseTimeBuckets();
-        for (long etime = 100L; etime <= 6000000L; etime += 10L) {
-            rtb.addTimeToInterval(etime * 1000L);
-        }
-        double[] percentiles = new double[] { 0.0025, 0.0050, 0.0075, 0.05, 0.075, 0.1, 1.0, 2.0, 5.5, 10.0, 30.0,
-            50.0, 80.0, 99.9, 99.99, 99.999 };
-        long[] expectedResult = new long[] { 240L, 390L, 540L, 3000L, 4500L, 6000L, 60000L, 120000L, 330000L,
-            600000L, 1800000L, 3000000L, 4800000L, 5500000L, 5500000L, 5500000L };
-        int count = expectedResult.length;
-        for (Long computedPercentile : rtb.getPercentile(percentiles, 599991)) {
-            assertThat(computedPercentile).isEqualTo(expectedResult[--count]);
-        }
-    }
-}
diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml
index 0cadd6402..1657310ee 100644
--- a/opendj-sdk-parent/pom.xml
+++ b/opendj-sdk-parent/pom.xml
@@ -59,6 +59,7 @@
         1.0.2
         3.1.0
         2.3.23
+        3.1.2
 
         
         
@@ -76,6 +77,13 @@
 
     
         
+            
+            
+                io.dropwizard.metrics
+                metrics-core
+                ${metrics-core.version}
+            
+
             
             
                 org.forgerock

From 1fa4654eb6a0d1d425132e2f3ee30f4e38e97f64 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal 
Date: Fri, 15 Jan 2016 18:27:07 +0100
Subject: [PATCH 043/125] OPENDJSDK-81 Remove asynchronous option in rate tools

This option was (almost) never used.
In addition, it just consists to perform a DoS attack, so Matt suggests
to remove it.
---
 .../forgerock/opendj/ldap/tools/AuthRate.java |  1 -
 .../opendj/ldap/tools/PerformanceRunner.java  | 54 ++++++-------------
 .../ldap/tools/PerformanceRunnerOptions.java  | 11 +---
 .../opendj/ldap/tools/StatsThread.java        | 20 +------
 .../opendj/ldap/tools/tools.properties        |  1 -
 5 files changed, 18 insertions(+), 69 deletions(-)

diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
index 582873ef8..881e5d3c8 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java
@@ -406,7 +406,6 @@ int run(final String[] args) {
             setDefaultPerfToolProperties();
             PerformanceRunnerOptions options = new PerformanceRunnerOptions(argParser, this);
             options.setSupportsRebind(false);
-            options.setSupportsAsynchronousRequests(false);
             options.setSupportsMultipleThreadsPerConnection(false);
 
             connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this);
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
index 0e5ed7c1a..fb7da7f7d 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java
@@ -157,25 +157,24 @@ public void run() {
                 long startTimeNs = System.nanoTime();
                 promise = performOperation(connection, dataSources.get(), startTimeNs);
                 statsThread.incrementOperationCount();
-                if (!isAsync) {
-                    try {
-                        promise.getOrThrow();
-                    } catch (final InterruptedException e) {
-                        // Ignore and check stop requested
-                        continue;
-                    } catch (final LdapException e) {
-                        if (!stopRequested && e.getCause() instanceof IOException) {
-                            e.getCause().printStackTrace(app.getErrorStream());
-                            stopTool(true);
-                            break;
-                        }
-                        // Ignore. Handled by result handler
-                    } finally {
-                        if (this.connection == null) {
-                            connection.close();
-                        }
+                try {
+                    promise.getOrThrow();
+                } catch (final InterruptedException e) {
+                    // Ignore and check stop requested
+                    continue;
+                } catch (final LdapException e) {
+                    if (!stopRequested && e.getCause() instanceof IOException) {
+                        e.getCause().printStackTrace(app.getErrorStream());
+                        stopTool(true);
+                        break;
+                    }
+                    // Ignore. Handled by result handler
+                } finally {
+                    if (this.connection == null) {
+                        connection.close();
                     }
                 }
+
                 if (targetThroughput > 0) {
                     try {
                         if (sleepTimeMs > 1) {
@@ -241,7 +240,6 @@ protected DataSource[] initialValue() {
     private long warmUpDurationMs;
     /** Max duration time in ms, 0 for unlimited. **/
     private long maxDurationTimeMs;
-    private boolean isAsync;
     private boolean noRebind;
     private BindRequest bindRequest;
     private int statsIntervalMs;
@@ -253,7 +251,6 @@ protected DataSource[] initialValue() {
     private final IntegerArgument percentilesArgument;
     private final BooleanArgument keepConnectionsOpen;
     private final BooleanArgument noRebindArgument;
-    private final BooleanArgument asyncArgument;
     private final StringArgument arguments;
     protected final IntegerArgument maxIterationsArgument;
     protected final IntegerArgument warmUpArgument;
@@ -339,15 +336,6 @@ protected DataSource[] initialValue() {
             argParser.addArgument(noRebindArgument);
         }
 
-        asyncArgument =
-                new BooleanArgument("asynchronous", 'A', "asynchronous", LocalizableMessage
-                        .raw("Use asynchronous mode and do not "
-                                + "wait for results before sending the next request"));
-        asyncArgument.setPropertyName("asynchronous");
-        if (options.supportsAsynchronousRequests()) {
-            argParser.addArgument(asyncArgument);
-        }
-
         arguments =
                 new StringArgument(
                         "argument",
@@ -402,7 +390,6 @@ public final void validate() throws ArgumentException {
         statsIntervalMs = statsIntervalArgument.getIntValue() * 1000;
         targetThroughput = targetThroughputArgument.getIntValue();
 
-        isAsync = asyncArgument.isPresent();
         noRebind = noRebindArgument.isPresent();
 
         if (!noRebindArgument.isPresent() && this.numThreads > 1) {
@@ -410,11 +397,6 @@ public final void validate() throws ArgumentException {
                 "--" + noRebindArgument.getLongIdentifier(), "--" + numThreadsArgument.getLongIdentifier(), "> 1"));
         }
 
-        if (!noRebindArgument.isPresent() && asyncArgument.isPresent()) {
-            throw new ArgumentException(ERR_TOOL_ARG_NEEDED_WHEN_USING_ARG.get(
-                "--" + noRebindArgument.getLongIdentifier(), asyncArgument.getLongIdentifier()));
-        }
-
         if (maxIterationsArgument.isPresent() && maxIterations <= 0) {
             throw new ArgumentException(ERR_TOOL_NOT_ENOUGH_ITERATIONS.get(
                 "--" + maxIterationsArgument.getLongIdentifier(), numConnections * numThreads,
@@ -505,10 +487,6 @@ protected void joinAllWorkerThreads() throws InterruptedException {
         }
     }
 
-    boolean isAsync() {
-        return isAsync;
-    }
-
     double[] getPercentiles() {
         if (percentilesArgument.isPresent()) {
             double[] percentiles = new double[percentilesArgument.getValues().size()];
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerOptions.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerOptions.java
index f4585deda..2a796b224 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerOptions.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunnerOptions.java
@@ -21,7 +21,7 @@
  * CDDL HEADER END
  *
  *
- *      Portions Copyright 2014-2015 ForgeRock AS
+ *      Portions Copyright 2014-2016 ForgeRock AS
  */
 
 package com.forgerock.opendj.ldap.tools;
@@ -37,7 +37,6 @@ class PerformanceRunnerOptions {
     private ConsoleApplication app;
 
     private boolean supportsRebind = true;
-    private boolean supportAsynchronousRequests = true;
     private boolean supportsMultipleThreadsPerConnection = true;
     private boolean supportsGeneratorArgument = true;
 
@@ -54,14 +53,6 @@ void setSupportsRebind(boolean supportsRebind) {
         this.supportsRebind = supportsRebind;
     }
 
-    boolean supportsAsynchronousRequests() {
-        return supportAsynchronousRequests;
-    }
-
-    void setSupportsAsynchronousRequests(boolean supportAsynchronousRequests) {
-        this.supportAsynchronousRequests = supportAsynchronousRequests;
-    }
-
     boolean supportsMultipleThreadsPerConnection() {
         return supportsMultipleThreadsPerConnection;
     }
diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
index 6d35ff8b1..885fdb658 100644
--- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
+++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/StatsThread.java
@@ -69,7 +69,6 @@ class StatsThread extends Thread {
     private static final String AVERAGE_RESPONSE_TIME_MS = STAT_ID_PREFIX + "average_response_time";
     private static final String PERCENTILES = STAT_ID_PREFIX + "percentiles";
     private static final String ERROR_PER_SECOND = STAT_ID_PREFIX + "error_per_second";
-    private static final String REQUEST_PER_RESPONSE = STAT_ID_PREFIX + "request_per_response";
 
     public static final double MS_IN_S = TimeUnit.SECONDS.toMillis(1);
     public static final double NS_IN_MS = TimeUnit.MILLISECONDS.toNanos(1);
@@ -116,7 +115,7 @@ private final class ConsoleRateReporter extends RateReporter {
         void printTitle() {
             final int throughputRawSpan = 2;
             final int responseTimeRawSpan = 2 + percentiles.length;
-            final int additionalStatsRawSpan = 1 + (performanceRunner.isAsync() ? 1 : 0) + additionalColumns.size();
+            final int additionalStatsRawSpan = 1 + additionalColumns.size();
 
             printer.printDashedLine();
             printer.printTitleSection("Throughput", throughputRawSpan);
@@ -146,10 +145,6 @@ MultiColumnPrinter createPrinter() {
             // Additional stats
             columns.add(separatorColumn());
             columns.add(column(ERROR_PER_SECOND, "err/sec", STANDARD_WIDTH, 1));
-            if (performanceRunner.isAsync()) {
-                columns.add(separatorColumn());
-                columns.add(column(REQUEST_PER_RESPONSE, "req/res", 4, 1));
-            }
             additionalColumns = registerAdditionalColumns();
             if (!additionalColumns.isEmpty()) {
                 columns.addAll(additionalColumns);
@@ -183,9 +178,6 @@ MultiColumnPrinter createPrinter() {
                         PERCENTILES + percentile, percentile + "% response time", 2));
             }
             columns.add(column(ERROR_PER_SECOND, "errors/second", 1));
-            if (performanceRunner.isAsync()) {
-                columns.add(column(REQUEST_PER_RESPONSE, "Requests/response", 1));
-            }
             columns.addAll(registerAdditionalColumns());
 
 
@@ -352,16 +344,6 @@ protected Ratio getRatio() {
                 return Ratio.of(errorCount.getLastIntervalCount(), durationMsCount.getLastIntervalCount() / MS_IN_S);
             }
         });
-
-        if (performanceRunner.isAsync()) {
-            registry.register(REQUEST_PER_RESPONSE, new RatioGauge() {
-                @Override
-                protected Ratio getRatio() {
-                    return Ratio.of(operationCount.getLastIntervalCount(),
-                            successCount.getLastIntervalCount() + errorCount.getLastIntervalCount());
-                }
-            });
-        }
         registry.register(PERCENTILES, responseTimes);
     }
 
diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
index e9c2edd9c..e5ab1a781 100755
--- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
+++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties
@@ -503,7 +503,6 @@ ERR_LDIF_GEN_TOOL_NO_SUCH_RESOURCE_DIRECTORY=The specified resource \
  directory %s does not exist
 ERR_TOOL_NOT_ENOUGH_ITERATIONS=%s argument must be greater than or equal to %s \
  (%s per %s)
-ERR_TOOL_ARG_NEEDED_WHEN_USING_ARG=%s must be used when using %s
 ERR_TOOL_ARG_MUST_BE_USED_WHEN_ARG_CONDITION=%s must be used if %s is %s
 INFO_TOOL_WARMING_UP=Warming up for %d seconds...
 ERR_AUTHRATE_NO_BIND_DN_PROVIDED=Authentication information must be provided \

From 5e5a82a78f12c0e5808ed6aa2bd395c9aa5edb33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?=
 
Date: Tue, 9 Feb 2016 12:56:52 +0100
Subject: [PATCH 044/125] OPENDJSDK-85 AVA does not provide a way to get back
 the user provided attribute type

The solution consists in adding AVA.getAttributeName().

AVA.java:
Added attributeNakme field + getter + modified toString()
Addeed constructor AVA(AttributeType, String attributeName, Object attributeValue).
In readAttributeName(), changed return type from AttributeType to String.
Improved javadoc, by ading a note about the name of this class.
Extracted method illegalCharacter().
Simplified needEscaping().

AVATestCase.java: ADDED

ByteString.java:
Made toHexString() compatible with valueOfHex() - necessary to have a correct AVA.toString()

ByteStringTestCase.java:
Added a test for encoding/decoding as hex.

CollationSubstringMatchingRuleTest.java:
Consequence of the change to ByteString.toHexString().
---
 .../java/org/forgerock/opendj/ldap/AVA.java   | 122 ++++++++++--------
 .../org/forgerock/opendj/ldap/ByteString.java |   5 +-
 .../forgerock/opendj/ldap/AVATestCase.java    |  64 +++++++++
 .../opendj/ldap/ByteStringTestCase.java       |   9 +-
 .../CollationSubstringMatchingRuleTest.java   |   6 +-
 5 files changed, 145 insertions(+), 61 deletions(-)
 mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java
 create mode 100644 opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java

diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
index 876714bc5..3c1cbeabb 100644
--- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
+++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java
@@ -22,13 +22,14 @@
  *
  *
  *      Copyright 2010 Sun Microsystems, Inc.
- *      Portions copyright 2011-2015 ForgeRock AS.
+ *      Portions copyright 2011-2016 ForgeRock AS.
  */
-
 package org.forgerock.opendj.ldap;
 
-import static com.forgerock.opendj.util.StaticUtils.*;
 import static com.forgerock.opendj.ldap.CoreMessages.*;
+import static com.forgerock.opendj.util.StaticUtils.*;
+
+import static org.forgerock.util.Reject.*;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -42,9 +43,7 @@
 import org.forgerock.opendj.ldap.schema.AttributeType;
 import org.forgerock.opendj.ldap.schema.MatchingRule;
 import org.forgerock.opendj.ldap.schema.Schema;
-import org.forgerock.opendj.ldap.schema.Syntax;
 import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException;
-import org.forgerock.util.Reject;
 
 import com.forgerock.opendj.util.StaticUtils;
 import com.forgerock.opendj.util.SubstringReader;
@@ -62,6 +61,10 @@
  * cn=Kurt Zeilenga
  *
* + * Note: The name AVA is historical, coming from X500/LDAPv2. + * However, in LDAP context, this class actually represents an + * AttributeTypeAndValue. + * * @see RFC 4512 - * Lightweight Directory Access Protocol (LDAP): Directory Information * Models @@ -121,7 +124,8 @@ static AVA decode(final SubstringReader reader, final Schema schema) { throw new LocalizedIllegalArgumentException(message); } - final AttributeType attribute = readAttributeName(reader, schema); + final String nameOrOid = readAttributeName(reader); + final AttributeType attribute = schema.getAttributeType(nameOrOid); // Skip over any spaces if we have. reader.skipWhitespaces(); @@ -151,7 +155,7 @@ static AVA decode(final SubstringReader reader, final Schema schema) { // Parse the value for this RDN component. final ByteString value = readAttributeValue(reader); - return new AVA(attribute, value); + return new AVA(attribute, nameOrOid, value); } static void escapeAttributeValue(final String str, final StringBuilder builder) { @@ -396,7 +400,7 @@ private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) return ByteString.valueOfUtf8(valueBuffer); } - private static AttributeType readAttributeName(final SubstringReader reader, final Schema schema) { + private static String readAttributeName(final SubstringReader reader) { int length = 1; reader.mark(); @@ -413,19 +417,11 @@ private static AttributeType readAttributeName(final SubstringReader reader, fin break; } else if (c == '.') { if (lastWasPeriod) { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(reader.getString(), c, - reader.pos() - 1); - throw new LocalizedIllegalArgumentException(message); - } else { - lastWasPeriod = true; + throw illegalCharacter(reader, c); } + lastWasPeriod = true; } else if (!isDigit(c)) { - // This must have been an illegal character. - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(reader.getString(), c, reader - .pos() - 1); - throw new LocalizedIllegalArgumentException(message); + throw illegalCharacter(reader, c); } else { lastWasPeriod = false; } @@ -442,28 +438,25 @@ private static AttributeType readAttributeName(final SubstringReader reader, fin // This signals the end of the OID. break; } else if (!isAlpha(c) && !isDigit(c) && c != '-') { - // This is an illegal character. - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(reader.getString(), c, reader - .pos() - 1); - throw new LocalizedIllegalArgumentException(message); + throw illegalCharacter(reader, c); } length++; } } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(reader.getString(), c, - reader.pos() - 1); - throw new LocalizedIllegalArgumentException(message); + throw illegalCharacter(reader, c); } reader.reset(); - // Return the position of the first non-space character after the - // token. + // Return the position of the first non-space character after the token + return reader.read(length); + } - return schema.getAttributeType(reader.read(length)); + private static LocalizedIllegalArgumentException illegalCharacter( + final SubstringReader reader, final char c) { + return new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ATTR_ILLEGAL_CHAR.get(reader.getString(), c, reader.pos() - 1)); } private static ByteString readAttributeValue(final SubstringReader reader) { @@ -591,12 +584,11 @@ private static ByteString readAttributeValue(final SubstringReader reader) { } private final AttributeType attributeType; - + private final String attributeName; private final ByteString attributeValue; /** Cached normalized value using equality matching rule. */ private ByteString equalityNormalizedAttributeValue; - /** Cached normalized value using ordering matching rule. */ private ByteString orderingNormalizedAttributeValue; @@ -616,10 +608,29 @@ private static ByteString readAttributeValue(final SubstringReader reader) { * {@code null}. */ public AVA(final AttributeType attributeType, final Object attributeValue) { - Reject.ifNull(attributeType, attributeValue); + this(attributeType, null, attributeValue); + } - this.attributeType = attributeType; - this.attributeValue = ByteString.valueOfObject(attributeValue); + /** + * Creates a new attribute value assertion (AVA) using the provided + * attribute type, name and value. + *

+ * If {@code attributeValue} is not an instance of {@code ByteString} then + * it will be converted using the {@link ByteString#valueOfObject(Object)} method. + * + * @param attributeType + * The attribute type. + * @param attributeName + * The user provided attribute name. + * @param attributeValue + * The attribute value. + * @throws NullPointerException + * If {@code attributeType}, {@code attributeName} or {@code attributeValue} was {@code null}. + */ + public AVA(final AttributeType attributeType, final String attributeName, final Object attributeValue) { + this.attributeType = checkNotNull(attributeType); + this.attributeName = computeAttributeName(attributeName, attributeType); + this.attributeValue = ByteString.valueOfObject(checkNotNull(attributeValue)); } /** @@ -640,13 +651,15 @@ public AVA(final AttributeType attributeType, final Object attributeValue) { * {@code null}. */ public AVA(final String attributeType, final Object attributeValue) { - Reject.ifNull(attributeType, attributeValue); - + this.attributeName = checkNotNull(attributeType); this.attributeType = Schema.getDefaultSchema().getAttributeType(attributeType); - this.attributeValue = ByteString.valueOfObject(attributeValue); + this.attributeValue = ByteString.valueOfObject(checkNotNull(attributeValue)); + } + + private String computeAttributeName(final String attributeName, final AttributeType attributeType) { + return attributeName != null ? attributeName : attributeType.getNameOrOID(); } - /** {@inheritDoc} */ @Override public int compareTo(final AVA ava) { final int result = attributeType.compareTo(ava.attributeType); @@ -659,7 +672,6 @@ public int compareTo(final AVA ava) { return normalizedValue.compareTo(otherNormalizedValue); } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -688,6 +700,15 @@ public AttributeType getAttributeType() { return attributeType; } + /** + * Returns the attribute name associated with this AVA. + * + * @return The attribute name associated with this AVA. + */ + public String getAttributeName() { + return attributeName; + } + /** * Returns the attribute value associated with this AVA. * @@ -697,7 +718,6 @@ public ByteString getAttributeValue() { return attributeValue; } - /** {@inheritDoc} */ @Override public int hashCode() { return attributeType.hashCode() * 31 + getEqualityNormalizedValue().hashCode(); @@ -715,7 +735,6 @@ public Attribute toAttribute() { return new LinkedAttribute(ad, attributeValue); } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -723,17 +742,15 @@ public String toString() { } StringBuilder toString(final StringBuilder builder) { - if (!attributeType.getNames().iterator().hasNext()) { + if (attributeName.equals(attributeType.getOID())) { builder.append(attributeType.getOID()); builder.append("=#"); builder.append(attributeValue.toHexString()); } else { - final String name = attributeType.getNameOrOID(); - builder.append(name); + builder.append(attributeName); builder.append("="); - final Syntax syntax = attributeType.getSyntax(); - if (!syntax.isHumanReadable()) { + if (!attributeType.getSyntax().isHumanReadable()) { builder.append("#"); builder.append(attributeValue.toHexString()); } else { @@ -879,15 +896,12 @@ private ByteString escapeBytes(final ByteString value) { } private boolean needEscaping(final ByteString value) { - boolean needEscaping = false; for (int i = 0; i < value.length(); i++) { - final byte b = value.byteAt(i); - if (isByteToEscape(b)) { - needEscaping = true; - break; + if (isByteToEscape(value.byteAt(i))) { + return true; } } - return needEscaping; + return false; } private boolean isByteToEscape(final byte b) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java old mode 100755 new mode 100644 index 4f6a69644..511bf65ad --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java @@ -22,7 +22,7 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -802,10 +802,9 @@ public String toHexString() { if (isEmpty()) { return ""; } - StringBuilder builder = new StringBuilder((length - 1) * 3 + 2); + StringBuilder builder = new StringBuilder(length * 2); builder.append(StaticUtils.byteToHex(buffer[offset])); for (int i = 1; i < length; i++) { - builder.append(' '); builder.append(StaticUtils.byteToHex(buffer[offset + i])); } return builder.toString(); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java new file mode 100644 index 000000000..f958a97fd --- /dev/null +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java @@ -0,0 +1,64 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * 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 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 + * + * Portions copyright 2016 ForgeRock AS. + */ +package org.forgerock.opendj.ldap; + +import static org.assertj.core.api.Assertions.*; + +import org.forgerock.opendj.ldap.schema.AttributeType; +import org.forgerock.opendj.ldap.schema.Schema; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +/** This class defines a set of tests for the {@link AVA} class. */ +@SuppressWarnings("javadoc") +public class AVATestCase extends SdkTestCase { + + @DataProvider + private Object[][] valueOfDataProvider() { + AttributeType cnAttrType = Schema.getCoreSchema().getAttributeType("commonName"); + return new Object[][] { + { "CN=value", cnAttrType, "CN", "value" }, + { "commonname=value", cnAttrType, "commonname", "value" }, + { "2.5.4.3=#76616C7565", cnAttrType, "2.5.4.3", "value" }, + }; + } + + @Test(dataProvider = "valueOfDataProvider") + public void valueOf(String avaString, AttributeType expectedAttrType, String expectedAttrName, + String expectedValue) throws Exception { + AVA ava = AVA.valueOf(avaString); + assertThat(ava.getAttributeType()).isEqualTo(expectedAttrType); + assertThat(ava.getAttributeName()).isEqualTo(expectedAttrName); + assertThat(ava.getAttributeValue()).isEqualTo(ByteString.valueOfUtf8(expectedValue)); + assertThat(ava.toString()).isEqualTo(avaString); + } + + @Test + public void hexEncodingDoesNotLoseInformation() throws Exception { + final String avaString = "2.5.4.3=#76616C7565"; + final String roundtrippedValue = AVA.valueOf(avaString).toString(); + assertThat(AVA.valueOf(roundtrippedValue).toString()).isEqualTo(avaString); + } +} diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java index 21f08aed9..06c39c9f3 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java @@ -266,7 +266,7 @@ public void testValueOfBase64(final String hexData, final String encodedData) th @Test public void testToHex() throws Exception { ByteString byteString = new ByteStringBuilder().appendUtf8("org=example").toByteString(); - assertThat(byteString.toHexString()).isEqualTo("6F 72 67 3D 65 78 61 6D 70 6C 65"); + assertThat(byteString.toHexString()).isEqualTo("6F72673D6578616D706C65"); assertThat(ByteString.empty().toHexString()).isEqualTo(""); } @@ -342,6 +342,13 @@ public void testValueOfHex() { assertThat(byteString.toString()).isEqualTo("cn=testvalue"); } + @Test + public void testToHexValueOfHex() { + ByteString bs = ByteString.valueOfUtf8("cn=testvalue"); + ByteString roundtrippedBS = ByteString.valueOfHex(bs.toHexString()); + assertThat(roundtrippedBS).isEqualTo(bs); + } + @Test public void testValueOfEmptyHex() { ByteString byteString = ByteString.valueOfHex(""); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java index 2851ae675..23868189f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java @@ -161,9 +161,9 @@ public void testCreateIndexQuery() throws Exception { ByteString bfinal = matchingRule.normalizeAttributeValue(ByteString.valueOfUtf8("c")); assertEquals(indexQuery, "intersect[" - + "rangeMatch(fr.shared, '" + binit.toHexString() + "' <= value < '00 54'), " - + "rangeMatch(fr.substring, '" + bfinal.toHexString() + "' <= value < '00 56'), " - + "rangeMatch(fr.substring, '" + binit.toHexString() + "' <= value < '00 54')]" + + "rangeMatch(fr.shared, '" + binit.toHexString() + "' <= value < '0054'), " + + "rangeMatch(fr.substring, '" + bfinal.toHexString() + "' <= value < '0056'), " + + "rangeMatch(fr.substring, '" + binit.toHexString() + "' <= value < '0054')]" ); } } From 17ca88f5f43d15ee66178bf16889abe4445eab12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Tue, 9 Feb 2016 13:00:47 +0100 Subject: [PATCH 045/125] DN.java: Added precisions about localName(int) vs. parent(int) --- .../src/main/java/org/forgerock/opendj/ldap/DN.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index dd9f7eac9..e2deffcf5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -736,12 +736,16 @@ public void remove() { * dn.localName(dn.size()).equals(dn); * * + * Said otherwise, a new DN is built using {@code index} RDNs, + * retained in the same order, starting from the left. + * * @param index * The number of RDNs to be included in the local name. * @return The DN whose content is the specified number of RDNs from this * DN. * @throws IllegalArgumentException * If {@code index} is less than zero. + * @see #parent(int) for the reverse operation (starting from the right) */ public DN localName(final int index) { Reject.ifFalse(index >= 0, "index less than zero"); @@ -786,6 +790,9 @@ public DN parent() { * RDNs removed. Note that if {@code index} is zero then this DN will be * returned (identity). * + * Said otherwise, a new DN is built using {@code index} RDNs, + * retained in the same order, starting from the right. + * * @param index * The number of RDNs to be removed. * @return The DN which is equal to this DN with the specified number of @@ -793,6 +800,7 @@ public DN parent() { * reached. * @throws IllegalArgumentException * If {@code index} is less than zero. + * @see #localName(int) for the reverse operation (starting from the left) */ public DN parent(final int index) { // We allow size + 1 so that we can return null as the parent of the From 045d1177dc5942cbf8eb4479b9417f5a4a16f173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Tue, 9 Feb 2016 16:36:08 +0100 Subject: [PATCH 046/125] OPENDJ-2693 dsconfig error message is showing the wrong port The ConnectionFactoryProvider is storing the port in two places: an IntegerArgument and an int field. Remove the int field and only keep the IntegerArgument to be consistent with other arguments. ConnectionFactoryProvider.java: Removed port field. In getPort(), conditionally read the port from standard input. if running in interactive mode and the port argument was not provided before In getConnectionFactory(), avoid repeting conditions. --- .../opendj/cli/ConnectionFactoryProvider.java | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index bd3b890c2..d3d4f9625 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Portions copyright 2011-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -130,9 +130,6 @@ public final class ConnectionFactoryProvider { /** Whether to use the password policy control in the bind request. */ private final BooleanArgument usePasswordPolicyControlArg; - /** The port number to used to connect. */ - private int port = DEFAULT_LDAP_PORT; - /** The SSL context linked to this connection. */ private SSLContext sslContext; @@ -297,8 +294,7 @@ public String getHostname() throws ArgumentException { value = hostNameArg.getValue(); } else if (app.isInteractive()) { try { - value = app.readInput(INFO_DESCRIPTION_HOST.get(), - hostNameArg.getDefaultValue() == null ? value : hostNameArg.getDefaultValue()); + value = app.readInput(INFO_DESCRIPTION_HOST.get(), getHostNameDefaultValue(value)); app.println(); hostNameArg.addValue(value); hostNameArg.setPresent(true); @@ -306,12 +302,16 @@ public String getHostname() throws ArgumentException { throw new ArgumentException(ERR_ERROR_CANNOT_READ_HOST_NAME.get(), e); } } else { - return hostNameArg.getDefaultValue() == null ? value : hostNameArg.getDefaultValue(); + return getHostNameDefaultValue(value); } return getHostNameForLdapUrl(value); } + private String getHostNameDefaultValue(String fallbackValue) { + return hostNameArg.getDefaultValue() != null ? hostNameArg.getDefaultValue() : fallbackValue; + } + /** * Get the port which has to be used for the command. * @@ -324,6 +324,14 @@ public int getPort() { } catch (ArgumentException e) { return Integer.valueOf(portArg.getDefaultValue()); } + } else if (app.isInteractive()) { + final LocalizableMessage portMsg = + isAdminConnection ? INFO_DESCRIPTION_ADMIN_PORT.get() : INFO_DESCRIPTION_PORT.get(); + int value = app.askPort(portMsg, Integer.valueOf(portArg.getDefaultValue()), logger); + app.println(); + portArg.addValue(Integer.toString(value)); + portArg.setPresent(true); + return value; } return Integer.valueOf(portArg.getDefaultValue()); } @@ -376,32 +384,24 @@ public ConnectionFactory getUnauthenticatedConnectionFactory() throws ArgumentEx private ConnectionFactory getConnectionFactory(boolean usePreAuthentication) throws ArgumentException { if (connFactory == null) { - port = portArg.isPresent() ? portArg.getIntValue() : 0; - checkForConflictingArguments(); if (app.isInteractive()) { - if (!hostNameArg.isPresent() || port == 0 || !bindNameArg.isPresent() - || (!bindPasswordArg.isPresent() && !bindPasswordFileArg.isPresent())) { + boolean portIsMissing = !portArg.isPresent() || portArg.getIntValue() == 0; + boolean bindPwdIsMissing = !bindPasswordArg.isPresent() && !bindPasswordFileArg.isPresent(); + if (!hostNameArg.isPresent() || portIsMissing || !bindNameArg.isPresent() || bindPwdIsMissing) { app.printHeader(INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS.get()); } if (!hostNameArg.isPresent()) { getHostname(); } - if (port == 0) { - LocalizableMessage portMsg; - if (isAdminConnection) { - portMsg = INFO_DESCRIPTION_ADMIN_PORT.get(); - } else { - portMsg = INFO_DESCRIPTION_PORT.get(); - } - port = app.askPort(portMsg, Integer.valueOf(portArg.getDefaultValue()), logger); - app.println(); + if (portIsMissing) { + getPort(); } if (!bindNameArg.isPresent()) { getBindName(); } - if (!bindPasswordArg.isPresent() && !bindPasswordFileArg.isPresent()) { + if (bindPwdIsMissing) { getPassword(); } } @@ -444,7 +444,7 @@ private ConnectionFactory getConnectionFactory(boolean usePreAuthentication) thr if (usePreAuthentication) { options.set(AUTHN_BIND_REQUEST, getBindRequest()); } - connFactory = new LDAPConnectionFactory(hostNameArg.getValue(), port, options); + connFactory = new LDAPConnectionFactory(hostNameArg.getValue(), portArg.getIntValue(), options); } return connFactory; } From 7c6f575c7965ba41dd19725c92e2cf31fca9cdf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 10 Feb 2016 09:37:20 +0100 Subject: [PATCH 047/125] SchemaTestCase.java: Added tests for Schema.getAttributeType() The tests were carried over from the server's test suite. --- .../opendj/ldap/schema/SchemaTestCase.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java index 56a9e1471..32e6a27e4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -38,9 +38,7 @@ import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; -/** - * Tests the Schema class. - */ +/** Tests the Schema class. */ @SuppressWarnings("javadoc") public class SchemaTestCase extends AbstractSchemaTestCase { @Test(description = "Unit test for OPENDJ-1477") @@ -107,4 +105,20 @@ public final void testReadSchemaAsyncMethodsMockConnection() throws Exception { connection.close(); } + @Test + public void getAttributeTypeWithDifferentNamesReturnSame() throws Exception { + Schema schema = CoreSchema.getInstance(); + AttributeType cnAttrType = schema.getAttributeType("cn"); + assertThat(cnAttrType).isSameAs(schema.getAttributeType("commonname")); + assertThat(cnAttrType).isSameAs(schema.getAttributeType("commonName")); + assertThat(cnAttrType).isSameAs(schema.getAttributeType("CN")); + } + + @Test + public void getAttributeTypeWithDifferentPlaceholderNames() throws Exception { + Schema schema = CoreSchema.getInstance().asNonStrictSchema(); + AttributeType placeHolderAttrType = schema.getAttributeType("placeholder"); + assertThat(placeHolderAttrType).isEqualTo(schema.getAttributeType("PLACEHOLDER")); + assertThat(placeHolderAttrType).isNotEqualTo(schema.getAttributeType("another_placeholder")); + } } From a46190fd2b6841e146b5473bc977850858753ce6 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 11 Feb 2016 11:09:33 +0100 Subject: [PATCH 048/125] OPENDJSDK-42 Code cleanup PR-45 Remove unused code. Remove unnecessary JavaDoc. Use interface type instead of implementation type as declarative type. Other minor cleanup actions. --- .../com/forgerock/opendj/cli/Argument.java | 126 +----------- .../opendj/cli/ArgumentConstants.java | 30 +-- .../forgerock/opendj/cli/ArgumentParser.java | 180 ++---------------- .../forgerock/opendj/cli/BooleanArgument.java | 18 +- .../forgerock/opendj/cli/CommonArguments.java | 140 +------------- .../opendj/cli/DocDescriptionSupplement.java | 6 +- .../opendj/cli/FileBasedArgument.java | 9 +- .../forgerock/opendj/cli/IntegerArgument.java | 82 ++------ .../opendj/cli/MultiChoiceArgument.java | 25 +-- .../forgerock/opendj/cli/StringArgument.java | 22 +-- .../opendj/cli/SubCommandArgumentParser.java | 101 +--------- .../opendj/ldap/tools/LDAPSearch.java | 2 +- 12 files changed, 57 insertions(+), 684 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java index c13b12084..8044d1d9a 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java @@ -22,15 +22,15 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; import static com.forgerock.opendj.cli.CliMessages.*; -import static com.forgerock.opendj.util.StaticUtils.*; import java.util.Iterator; import java.util.LinkedList; +import java.util.List; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; @@ -76,7 +76,7 @@ public abstract class Argument implements DocDescriptionSupplement { /** * Indicates whether this argument was provided in the set of - * properties found is a properties file. + * properties found in a properties file. */ private boolean isValueSetByProperty; @@ -170,35 +170,6 @@ public void clearValues() { values.clear(); } - /** - * Retrieves the value of this argument as a Boolean. - * - * @return The value of this argument as a Boolean. - * @throws ArgumentException - * If this argument cannot be interpreted as a Boolean value. - */ - public boolean getBooleanValue() throws ArgumentException { - if (values.isEmpty()) { - throw new ArgumentException(ERR_ARG_NO_BOOLEAN_VALUE.get(name)); - } - - final Iterator iterator = values.iterator(); - final String valueString = toLowerCase(iterator.next()); - if (iterator.hasNext()) { - throw new ArgumentException(ERR_ARG_BOOLEAN_MULTIPLE_VALUES.get(name)); - } - - if ("true".equals(valueString) || "yes".equals(valueString) - || "on".equals(valueString) || "1".equals(valueString)) { - return true; - } else if ("false".equals(valueString) || "no".equals(valueString) - || "off".equals(valueString) || "0".equals(valueString)) { - return false; - } else { - throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_BOOLEAN.get(valueString, name)); - } - } - /** * Retrieves the default value that will be used for this argument if it is * not specified on the command line and it is not set from a properties @@ -222,69 +193,19 @@ public LocalizableMessage getDescription() { return description != null ? description : LocalizableMessage.EMPTY; } - /** - * A supplement to the description intended for use in generated reference documentation. - */ + /** A supplement to the description intended for use in generated reference documentation. */ private LocalizableMessage docDescriptionSupplement; - /** {@inheritDoc} */ @Override public LocalizableMessage getDocDescriptionSupplement() { return docDescriptionSupplement != null ? docDescriptionSupplement : LocalizableMessage.EMPTY; } - /** {@inheritDoc} */ @Override public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { this.docDescriptionSupplement = docDescriptionSupplement; } - /** - * Retrieves the value of this argument as an integer. - * - * @return The value of this argument as an integer. - * @throws ArgumentException - * If there are multiple values, or the value cannot be parsed - * as an integer. - */ - public double getDoubleValue() throws ArgumentException { - if (values.isEmpty()) { - throw new ArgumentException(ERR_ARG_NO_INT_VALUE.get(name)); - } - - final Iterator iterator = values.iterator(); - final String valueString = iterator.next(); - if (iterator.hasNext()) { - throw new ArgumentException(ERR_ARG_INT_MULTIPLE_VALUES.get(name)); - } - - try { - return Double.parseDouble(valueString); - } catch (final Exception e) { - throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, name), e); - } - } - - /** - * Retrieves the set of values for this argument as a list of integers. - * - * @return A list of the integer representations of the values for this - * argument. - * @throws ArgumentException - * If any of the values cannot be parsed as an integer. - */ - public LinkedList getDoubleValues() throws ArgumentException { - final LinkedList results = new LinkedList<>(); - for (String valueString : values) { - try { - results.add(Double.valueOf(valueString)); - } catch (final Exception e) { - throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_DOUBLE.get(valueString, name), e); - } - } - return results; - } - /** * Retrieves the value of this argument as an integer. * @@ -311,26 +232,6 @@ public int getIntValue() throws ArgumentException { } } - /** - * Retrieves the set of values for this argument as a list of integers. - * - * @return A list of the integer representations of the values for this - * argument. - * @throws ArgumentException - * If any of the values cannot be parsed as an integer. - */ - public LinkedList getIntValues() throws ArgumentException { - final LinkedList results = new LinkedList<>(); - for (String valueString : values) { - try { - results.add(Integer.valueOf(valueString)); - } catch (final Exception e) { - throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, name), e); - } - } - return results; - } - /** * Retrieves the long (multi-character) identifier that may be used to * specify the value of this argument. @@ -404,7 +305,7 @@ public LocalizableMessage getValuePlaceholder() { * * @return The set of string values for this argument. */ - public LinkedList getValues() { + public List getValues() { return values; } @@ -524,19 +425,6 @@ public void setMultiValued(final boolean isMultiValued) { this.isMultiValued = isMultiValued; } - /** - * Specifies whether a value must be provided with this argument if it is - * present. If this is changed from false to true, - * then a value placeholder must also be provided. - * - * @param needsValue - * Indicates whether a value must be provided with this argument - * if it is present. - */ - public void setNeedsValue(final boolean needsValue) { - this.needsValue = needsValue; - } - /** * Specifies whether this argument is present in the parsed set of * command-line arguments. @@ -609,10 +497,8 @@ public void setValueSetByProperty(final boolean isValueSetByProperty) { * @return true if the value is acceptable, or * false if it is not. */ - public abstract boolean valueIsAcceptable(String valueString, - LocalizableMessageBuilder invalidReason); + public abstract boolean valueIsAcceptable(String valueString, LocalizableMessageBuilder invalidReason); - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder sb = new StringBuilder(); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java index 4a700c212..e4ac32ade 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS + * Copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -227,30 +227,10 @@ public final class ArgumentConstants { /** The value for the long option version. */ public static final String OPTION_LONG_PRODUCT_VERSION = "version"; - /** The value for the short option groupName attributes. */ - public static final char OPTION_SHORT_GROUPNAME = 'g'; - /** The value for the long option groupName attribute. */ - public static final String OPTION_LONG_GROUPNAME = "groupName"; - - /** The value for the short option newGroupName attribute. */ - public static final char OPTION_SHORT_NEWGROUPNAME = 'n'; - /** The value for the long option groupName attribute. */ - public static final String OPTION_LONG_NEWGROUPNAME = "newGroupName"; - - /** The value for the short option serverID attributes. */ - public static final String OPTION_SHORT_SERVERID = null; - /** The value for the long option serverID attribute. */ - public static final String OPTION_LONG_SERVERID = "serverID"; - - /** The value for the short option userID attributes. */ - public static final String OPTION_SHORT_USERID = null; - /** The value for the long option userID attribute. */ - public static final String OPTION_LONG_USERID = "userID"; - - /** The value for the short option set. */ - public static final Character OPTION_SHORT_SET = null; - /** The value for the long option set. */ - public static final String OPTION_LONG_SET = "set"; + /** The value for the long "checkStoppability" {@link Argument}. */ + public static final String OPTION_LONG_CHECK_STOPPABILITY = "checkStoppability"; + /** The value for the long "windowsNetStop" {@link Argument}. */ + public static final String OPTION_LONG_WINDOWS_NET_STOP = "windowsNetStop"; /** Value for the quiet option short form. */ public static final Character OPTION_SHORT_QUIET = 'Q'; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java index 9ba847a4f..0cfac0cfa 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -120,13 +120,11 @@ public String toString() { }; /** The set of arguments defined for this parser, referenced by short ID. */ - private final HashMap shortIDMap = new HashMap<>(); + private final Map shortIDMap = new HashMap<>(); /** The set of arguments defined for this parser, referenced by long ID. */ - private final HashMap longIDMap = new HashMap<>(); - /** The set of arguments defined for this parser, referenced by argument name. */ - private final HashMap argumentMap = new HashMap<>(); + private final Map longIDMap = new HashMap<>(); /** The total set of arguments defined for this parser. */ - private final LinkedList argumentList = new LinkedList<>(); + private final List argumentList = new LinkedList<>(); /** The maximum number of unnamed trailing arguments that may be provided. */ private final int maxTrailingArguments; @@ -153,9 +151,6 @@ public String toString() { /** The display name that will be used for the trailing arguments in the usage information. */ private final String trailingArgsDisplayName; - /** The raw set of command-line arguments that were provided. */ - private String[] rawArguments; - /** Set of argument groups. */ protected final Set argumentGroups = new TreeSet<>(); @@ -406,9 +401,8 @@ Properties checkExternalProperties() throws ArgumentException { return null; } - // check if the properties file argument has been set. If not - // look for default location. - String propertiesFilePath = null; + // check if the properties file argument has been set. If not look for default location. + String propertiesFilePath; if (filePropertiesPathArgument.isPresent()) { propertiesFilePath = filePropertiesPathArgument.getValue(); } else { @@ -456,18 +450,6 @@ Properties checkExternalProperties() throws ArgumentException { } } - /** - * Retrieves the argument with the specified name. - * - * @param name - * The name of the argument to retrieve. - * @return The argument with the specified name, or null if - * there is no such argument. - */ - Argument getArgument(final String name) { - return argumentMap.get(name); - } - /** * Retrieves the argument with the specified long identifier. * @@ -480,18 +462,6 @@ public Argument getArgumentForLongID(final String longID) { return longIDMap.get(longID); } - /** - * Retrieves the argument with the specified short identifier. - * - * @param shortID - * The short ID for the argument to retrieve. - * @return The argument with the specified short identifier, or - * null if there is no such argument. - */ - Argument getArgumentForShortID(final Character shortID) { - return shortIDMap.get(shortID); - } - /** * Retrieves the list of all arguments that have been defined for this * argument parser. @@ -499,34 +469,10 @@ Argument getArgumentForShortID(final Character shortID) { * @return The list of all arguments that have been defined for this * argument parser. */ - public LinkedList getArgumentList() { + public List getArgumentList() { return argumentList; } - /** - * Retrieves the set of arguments mapped by the long identifier that may be - * used to reference them. Note that arguments that do not have a long - * identifier will not be present in this list. - * - * @return The set of arguments mapped by the long identifier that may be - * used to reference them. - */ - HashMap getArgumentsByLongID() { - return longIDMap; - } - - /** - * Retrieves the set of arguments mapped by the short identifier that may be - * used to reference them. Note that arguments that do not have a short - * identifier will not be present in this list. - * - * @return The set of arguments mapped by the short identifier that may be - * used to reference them. - */ - HashMap getArgumentsByShortID() { - return shortIDMap; - } - /** * Retrieves the fully-qualified name of the Java class that should be * invoked to launch the program with which this argument parser is @@ -540,40 +486,6 @@ String getMainClassName() { return mainClassName; } - /** - * Retrieves the maximum number of unnamed trailing arguments that may be - * provided. - * - * @return The maximum number of unnamed trailing arguments that may be - * provided, or a value less than or equal to zero if no maximum - * will be enforced. - */ - int getMaxTrailingArguments() { - return maxTrailingArguments; - } - - /** - * Retrieves the minimum number of unnamed trailing arguments that must be - * provided. - * - * @return The minimum number of unnamed trailing arguments that must be - * provided, or a value less than or equal to zero if no minimum - * will be enforced. - */ - int getMinTrailingArguments() { - return minTrailingArguments; - } - - /** - * Retrieves the raw set of arguments that were provided. - * - * @return The raw set of arguments that were provided, or null - * if the argument list has not yet been parsed. - */ - String[] getRawArguments() { - return rawArguments; - } - /** * Given an argument, returns an appropriate group. Arguments may be part of * one of the special groups or the default group. @@ -1039,18 +951,6 @@ boolean isUsageArgument(final Argument a) { return usageArgument != null && usageArgument.getName().equals(a.getName()); } - /** - * Retrieves a message containing usage information based on the defined - * arguments. - * - * @return A string containing usage information based on the defined - * arguments. - */ - public LocalizableMessage getUsageMessage() { - // TODO: rework getUsage(OutputStream) to work with messages framework - return LocalizableMessage.raw(getUsage()); - } - /** Prints the version. */ void printVersion() { versionPresent = true; @@ -1118,10 +1018,7 @@ public void parseArguments(final String[] rawArguments) throws ArgumentException * If a problem was encountered while parsing the provided * arguments. */ - public void parseArguments(final String[] rawArguments, Properties argumentProperties) - throws ArgumentException { - this.rawArguments = rawArguments; - + public void parseArguments(final String[] rawArguments, Properties argumentProperties) throws ArgumentException { boolean inTrailingArgs = false; final int numArguments = rawArguments.length; @@ -1154,12 +1051,11 @@ public void parseArguments(final String[] rawArguments, Properties argumentPrope String argName = arg.substring(2); String argValue = null; final int equalPos = argName.indexOf('='); - if (equalPos < 0) { - // This is fine. The value is not part of the argument name token. - } else if (equalPos == 0) { + // If equalsPos < 0, this is fine. The value is not part of the argument name token. + if (equalPos == 0) { // The argument starts with "--=", which is not acceptable. throw new ArgumentException(ERR_ARGPARSER_LONG_ARG_WITHOUT_NAME.get(arg)); - } else { + } else if (equalPos > 0) { // The argument is in the form --name=value, so parse them both out. argValue = argName.substring(equalPos + 1); argName = argName.substring(0, equalPos); @@ -1379,8 +1275,6 @@ public void parseArguments(final String[] rawArguments, Properties argumentPrope */ public void parseArguments(final String[] rawArguments, final String propertiesFile, final boolean requirePropertiesFile) throws ArgumentException { - this.rawArguments = rawArguments; - Properties argumentProperties = null; try (final FileInputStream fis = new FileInputStream(propertiesFile)) { @@ -1415,16 +1309,6 @@ boolean printUsageGroupHeaders() { return groupsContainingArgs > 1; } - /** - * Sets the usage group description for the default argument group. - * - * @param description - * for the default group - */ - void setDefaultArgumentGroupDescription(final LocalizableMessage description) { - this.defaultArgGroup.setDescription(description); - } - /** * Sets the provided argument which will be used to identify the file * properties. @@ -1437,36 +1321,6 @@ public void setFilePropertiesArgument(final StringArgument argument) { filePropertiesPathArgument = argument; } - /** - * Sets the usage group description for the general argument group. - * - * @param description - * for the general group - */ - void setGeneralArgumentGroupDescription(final LocalizableMessage description) { - this.generalArgGroup.setDescription(description); - } - - /** - * Sets the usage group description for the input/output argument group. - * - * @param description - * for the input/output group - */ - void setInputOutputArgumentGroupDescription(final LocalizableMessage description) { - this.ioArgGroup.setDescription(description); - } - - /** - * Sets the usage group description for the LDAP argument group. - * - * @param description - * for the LDAP group - */ - void setLdapArgumentGroupDescription(final LocalizableMessage description) { - this.ldapArgGroup.setDescription(description); - } - /** * Sets the provided argument which will be used to identify the file * properties. @@ -1479,15 +1333,6 @@ public void setNoPropertiesFileArgument(final BooleanArgument argument) { noPropertiesFileArgument = argument; } - /** - * Sets the raw set of arguments. - * - * @param rawArguments the raw set of arguments to set - */ - void setRawArguments(String[] rawArguments) { - this.rawArguments = rawArguments; - } - /** * Sets the provided argument as one which will automatically trigger the * output of usage information if it is provided on the command line and no @@ -1740,8 +1585,7 @@ void normalizeArguments(final Properties argumentProperties, final Listtrue if the value is acceptable, or - * false if it is not. - */ @Override - public boolean valueIsAcceptable(final String valueString, - final LocalizableMessageBuilder invalidReason) { + public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { // This argument type should never have a value, so any value // provided will be unacceptable. invalidReason.append(ERR_BOOLEANARG_NO_VALUE_ALLOWED.get(getName())); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index ba719ece6..c5502f24d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -101,31 +101,6 @@ public static IntegerArgument getPort(final int defaultPort, final LocalizableMe description != null ? description : INFO_DESCRIPTION_ADMIN_PORT.get()); } - /** - * Returns the "postreadattrs" string argument. - * - * @return The "postreadattrs" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getPostReadAttributes() throws ArgumentException { - return new StringArgument("postreadattrs", null, "postReadAttributes", false, false, true, - INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null, "postReadAttributes", - INFO_DESCRIPTION_POSTREAD_ATTRS.get()); - } - - /** - * Returns the "prereadattrs" string argument. - * - * @return The "prereadattrs" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getPreReadAttributes() throws ArgumentException { - return new StringArgument("prereadattrs", null, "preReadAttributes", false, false, true, - INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null, "preReadAttributes", INFO_DESCRIPTION_PREREAD_ATTRS.get()); - } - /** * Returns the "propertiesFilePath" string argument. * @@ -207,20 +182,6 @@ public static IntegerArgument getLdapVersion() throws ArgumentException { OPTION_LONG_PROTOCOL_VERSION, INFO_DESCRIPTION_VERSION.get()); } - /** - * Returns the "windowsnetstop" boolean argument. - * - * @return The "windowsnetstop" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getWindowsNetStop() throws ArgumentException { - final BooleanArgument netStop = new BooleanArgument("windowsnetstop", null, "windowsNetStop", - INFO_DESCRIPTION_WINDOWS_NET_STOP.get()); - netStop.setHidden(true); - return netStop; - } - /** * Returns the "quiet" boolean argument. * @@ -273,22 +234,6 @@ public static BooleanArgument getAcceptLicense() throws ArgumentException { INFO_OPTION_ACCEPT_LICENSE.get()); } - /** - * Returns the "targetldif" string argument. - *
N.B : the 't' short option is also used by timelimit, - * testonly, trustmanagerproviderdn, stoptime, start(dateTime). - * - * @param description - * The description of this argument. - * @return The "targetldif" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getTargetLDIF(final LocalizableMessage description) throws ArgumentException { - return new StringArgument("targetldif", 't', "targetLDIF", true, false, true, INFO_LDIFFILE_PLACEHOLDER.get(), - null, null, description); - } - /** * Returns the "timelimit" boolean argument.
* N.B : the 't' short option is also used by targetldif, testonly, trustmanagerproviderdn, stoptime, @@ -431,20 +376,6 @@ public static BooleanArgument getCLI() throws ArgumentException { return cli; } - /** - * Returns the "checkstoppability" boolean argument. - * - * @return The "checkstoppability" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getCheckStoppability() throws ArgumentException { - final BooleanArgument cs = new BooleanArgument("checkstoppability", null, "checkStoppability", - INFO_CHECK_STOPPABILITY.get()); - cs.setHidden(true); - return cs; - } - /** * Returns the "configfile" string argument.
* N.B : the 'f' short option is also used by filename @@ -503,30 +434,6 @@ public static StringArgument getBackupDirectory() throws ArgumentException { INFO_BACKUPDIR_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_BACKUP_DIR.get()); } - /** - * Returns the "backupID" string argument. - * - * @return The "backupID" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getBackupId() throws ArgumentException { - return new StringArgument("backupid", 'I', "backupID", false, false, true, - INFO_BACKUPID_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_BACKUP_ID.get()); - } - - /** - * Returns the "backupall" boolean argument.
N.B : the 'a' short option is also used by addbaseentry, - * defaultAdd. - * - * @return The "backupall" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getBackupAll() throws ArgumentException { - return new BooleanArgument("backupall", 'a', "backUpAll", INFO_DESCRIPTION_BACKUP_ALL.get()); - } - /** * Returns the "baseDN" string argument. * @@ -713,7 +620,7 @@ public static StringArgument getSASL() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static MultiChoiceArgument getSearchScope() throws ArgumentException { + public static MultiChoiceArgument getSearchScope() throws ArgumentException { final MultiChoiceArgument searchScope = new MultiChoiceArgument<>( OPTION_LONG_SEARCHSCOPE, OPTION_SHORT_SEARCHSCOPE, OPTION_LONG_SEARCHSCOPE, false, true, INFO_SEARCH_SCOPE_PLACEHOLDER.get(), SearchScope.values(), false, @@ -852,21 +759,6 @@ public static BooleanArgument getSkipPortCheck() throws ArgumentException { return skipPortCheck; } - /** - * Returns the "sourceldif" string argument.
- * N.B : the 's' short option is also used by searchScope, servicestate, randomSeed, script-friendly. - * - * @param description - * The description of this argument. - * @return The "sourceldif" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getSourceLDIF(final LocalizableMessage description) throws ArgumentException { - return new StringArgument("sourceldif", 's', "sourceLDIF", true, false, true, INFO_LDIFFILE_PLACEHOLDER.get(), - null, null, description); - } - /** * Returns the "startTLS" boolean argument. * @@ -988,18 +880,6 @@ public static BooleanArgument getDoNotStart() throws ArgumentException { return doNotStartArg; } - /** - * Returns the "defaultAdd" boolean argument. - *
N.B : the 'a' short option is also used by addbaseentry, defaultAdd. - * - * @return The "defaultAdd" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getDefaultAdd() throws ArgumentException { - return new BooleanArgument("defaultAdd", 'a', "defaultAdd", INFO_MODIFY_DESCRIPTION_DEFAULT_ADD.get()); - } - /** * Returns the "disableservice" boolean argument.
* N.B : the 'd' short option is also used by backupdirectory, sampledata. @@ -1196,21 +1076,6 @@ public static StringArgument getUsePKCS12KeyStore() throws ArgumentException { INFO_ARGUMENT_DESCRIPTION_USE_PKCS12.get()); } - /** - * Returns the "useSASLExternal" boolean argument.
- * N.B : the 'r' short option is also used by stopreason, remote. - * - * @return The "useSASLExternal" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getUseSASLExternal() throws ArgumentException { - final BooleanArgument useSASLExternal = new BooleanArgument("useSASLExternal", 'r', "useSASLExternal", - INFO_DESCRIPTION_USE_SASL_EXTERNAL.get()); - useSASLExternal.setPropertyName("useSASLExternal"); - return useSASLExternal; - } - /** * Returns the "useSSL" boolean argument.
* N.B : the 'Z' short option is also used by ldapsport. @@ -1304,5 +1169,4 @@ public static StringArgument getCertNickName() throws ArgumentException { OPTION_LONG_CERT_NICKNAME, false, true, true, INFO_NICKNAME_PLACEHOLDER.get(), null, OPTION_LONG_CERT_NICKNAME, INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME.get()); } - } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java index 09562e6f4..9285b505c 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -38,7 +38,7 @@ public interface DocDescriptionSupplement { * @return The supplement to the description for use in generated reference documentation, * or LocalizableMessage.EMPTY if there is no supplement. */ - public LocalizableMessage getDocDescriptionSupplement(); + LocalizableMessage getDocDescriptionSupplement(); /** * Sets a supplement to the description intended for use in generated reference documentation. @@ -46,5 +46,5 @@ public interface DocDescriptionSupplement { * @param docDescriptionSupplement The supplement to the description * for use in generated reference documentation. */ - public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement); + void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement); } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java index 8d71a386f..6ac905cae 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -35,6 +35,7 @@ import java.io.FileReader; import java.io.IOException; import java.util.LinkedHashMap; +import java.util.Map; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; @@ -45,7 +46,7 @@ * command line, it will be treated as the path to the file containing the * actual value rather than the value itself.
*
- * Note that if if no filename is provided on the command line but a default + * Note that if no filename is provided on the command line but a default * value is specified programmatically or if the default value is read from a * specified property, then that default value will be taken as the actual value * rather than a filename.
@@ -56,7 +57,7 @@ */ public final class FileBasedArgument extends Argument { /** The mapping between filenames specified and the first lines read from those files. */ - private final LinkedHashMap namesToValues = new LinkedHashMap<>(); + private final Map namesToValues = new LinkedHashMap<>(); /** * Creates a new file-based argument with the provided information. @@ -163,7 +164,7 @@ public void addValue(final String valueString) { * @return A map between the filenames specified on the command line and the * first lines read from those files. */ - public LinkedHashMap getNameToValueMap() { + public Map getNameToValueMap() { return namesToValues; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java index 90e41a0d9..d832e7585 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -273,48 +273,6 @@ public IntegerArgument(final String name, final Character shortIdentifier, upperBound = Integer.MAX_VALUE; } - /** - * Retrieves the lower bound that may be enforced for values of this - * argument. - * - * @return The lower bound that may be enforced for values of this argument. - */ - public int getLowerBound() { - return lowerBound; - } - - /** - * Retrieves the upper bound that may be enforced for values of this - * argument. - * - * @return The upper bound that may be enforced for values of this argument. - */ - public int getUpperBound() { - return upperBound; - } - - /** - * Indicates whether a lower bound should be enforced for values of this - * argument. - * - * @return true if a lower bound should be enforced for values - * of this argument, or false if not. - */ - public boolean hasLowerBound() { - return hasLowerBound; - } - - /** - * Indicates whether a upper bound should be enforced for values of this - * argument. - * - * @return true if a upper bound should be enforced for values - * of this argument, or false if not. - */ - public boolean hasUpperBound() { - return hasUpperBound; - } - /** * Indicates whether the provided value is acceptable for use in this * argument. @@ -328,35 +286,23 @@ public boolean hasUpperBound() { * false if it is not. */ @Override - public boolean valueIsAcceptable(final String valueString, - final LocalizableMessageBuilder invalidReason) { - // First, the value must be decodable as an integer. - int intValue; + public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { try { - intValue = Integer.parseInt(valueString); - } catch (final Exception e) { - invalidReason.append(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, getPropertyName())); - return false; - } - - // If there is a lower bound, then the value must be greater than or - // equal to it. - if (hasLowerBound && (intValue < lowerBound)) { - invalidReason.append(ERR_INTARG_VALUE_BELOW_LOWER_BOUND.get(getPropertyName(), intValue, - lowerBound)); - return false; - } + final int intValue = Integer.parseInt(valueString); + if (hasLowerBound && intValue < lowerBound) { + invalidReason.append(ERR_INTARG_VALUE_BELOW_LOWER_BOUND.get(getPropertyName(), intValue, lowerBound)); + return false; + } - // If there is an upper bound, then the value must be less than or - // equal to it. - if (hasUpperBound && (intValue > upperBound)) { + if (hasUpperBound && intValue > upperBound) { + invalidReason.append(ERR_INTARG_VALUE_ABOVE_UPPER_BOUND.get(getPropertyName(), intValue, upperBound)); + return false; + } - invalidReason.append(ERR_INTARG_VALUE_ABOVE_UPPER_BOUND.get(getPropertyName(), intValue, - upperBound)); + return true; + } catch (final NumberFormatException e) { + invalidReason.append(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, getPropertyName())); return false; } - - // At this point, the value should be acceptable. - return true; } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java index e33bea4dd..92b3b9e1d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; @@ -155,17 +155,7 @@ public MultiChoiceArgument(final String name, final Character shortIdentifier, } /** - * Retrieves the set of allowed values for this argument. The contents of - * this set must not be altered by the caller. - * - * @return The set of allowed values for this argument. - */ - public Collection getAllowedValues() { - return allowedValues; - } - - /** - * Retrieves the string vale for this argument. If it has multiple values, + * Retrieves the string value for this argument. If it has multiple values, * then the first will be returned. If it does not have any values, then the * default value will be returned. * @@ -188,17 +178,6 @@ public T getTypedValue() throws ArgumentException { throw new ArgumentException(null); } - /** - * Indicates whether the set of allowed values for this argument should be - * treated in a case-sensitive manner. - * - * @return true if the values are to be treated in a - * case-sensitive manner, or false if not. - */ - public boolean isCaseSensitive() { - return caseSensitive; - } - /** * Specifies the default value that will be used for this argument if it is * not specified on the command line and it is not set from a properties diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java index 7c5fb6d0c..70b52c4bc 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java @@ -22,16 +22,14 @@ * * * Copyright 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package com.forgerock.opendj.cli; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; -/** - * This class defines an argument type that will accept any string value. - */ +/** This class defines an argument type that will accept any string value. */ public final class StringArgument extends Argument { /** * Creates a new string argument with the provided information. @@ -115,21 +113,9 @@ public StringArgument(final String name, final Character shortIdentifier, valuePlaceholder, null, null, description); } - /** - * Indicates whether the provided value is acceptable for use in this - * argument. - * - * @param valueString - * The value for which to make the determination. - * @param invalidReason - * A buffer into which the invalid reason may be written if the - * value is not acceptable. - * @return true if the value is acceptable, or - * false if it is not. - */ + @Override - public boolean valueIsAcceptable(final String valueString, - final LocalizableMessageBuilder invalidReason) { + public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { // All values will be acceptable for this argument. return true; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java index 56788b033..2c0ef3342 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java @@ -22,7 +22,7 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -99,15 +99,6 @@ public SubCommandArgumentParser(String mainClassName, LocalizableMessage toolDes super(mainClassName, toolDescription, longArgumentsCaseSensitive); } - /** - * Retrieves the list of all global arguments that have been defined for this argument parser. - * - * @return The list of all global arguments that have been defined for this argument parser. - */ - public List getGlobalArgumentList() { - return globalArgumentList; - } - /** * Indicates whether this argument parser contains a global argument with the specified name. * @@ -119,38 +110,6 @@ public boolean hasGlobalArgument(String argumentName) { return globalArgumentMap.containsKey(argumentName); } - /** - * Retrieves the global argument with the specified name. - * - * @param name - * The name of the global argument to retrieve. - * @return The global argument with the specified name, or null if there is no such argument. - */ - public Argument getGlobalArgument(String name) { - return globalArgumentMap.get(name); - } - - /** - * Retrieves the set of global arguments mapped by the short identifier that may be used to reference them. Note - * that arguments that do not have a short identifier will not be present in this list. - * - * @return The set of global arguments mapped by the short identifier that may be used to reference them. - */ - public Map getGlobalArgumentsByShortID() { - return globalShortIDMap; - } - - /** - * Indicates whether this argument parser has a global argument with the specified short ID. - * - * @param shortID - * The short ID character for which to make the determination. - * @return true if a global argument exists with the specified short ID, or false if not. - */ - public boolean hasGlobalArgumentWithShortID(Character shortID) { - return globalShortIDMap.containsKey(shortID); - } - /** * Retrieves the global argument with the specified short identifier. * @@ -163,27 +122,6 @@ public Argument getGlobalArgumentForShortID(Character shortID) { return globalShortIDMap.get(shortID); } - /** - * Retrieves the set of global arguments mapped by the long identifier that may be used to reference them. Note that - * arguments that do not have a long identifier will not be present in this list. - * - * @return The set of global arguments mapped by the long identifier that may be used to reference them. - */ - public Map getGlobalArgumentsByLongID() { - return globalLongIDMap; - } - - /** - * Indicates whether this argument parser has a global argument with the specified long ID. - * - * @param longID - * The long ID string for which to make the determination. - * @return true if a global argument exists with the specified long ID, or false if not. - */ - public boolean hasGlobalArgumentWithLongID(String longID) { - return globalLongIDMap.containsKey(longID); - } - /** * Retrieves the global argument with the specified long identifier. * @@ -196,15 +134,6 @@ public Argument getGlobalArgumentForLongID(String longID) { return globalLongIDMap.get(longID); } - /** - * Retrieves the set of subcommands defined for this argument parser, referenced by subcommand name. - * - * @return The set of subcommands defined for this argument parser, referenced by subcommand name. - */ - public SortedMap getSubCommands() { - return subCommands; - } - /** * Indicates whether this argument parser has a subcommand with the specified name. * @@ -350,33 +279,6 @@ public void addGlobalArgument(Argument argument, ArgumentGroup group) throws Arg argumentGroups.add(group); } - /** - * Removes the provided argument from the set of global arguments handled by this parser. - * - * @param argument - * The argument to be removed. - */ - protected void removeGlobalArgument(Argument argument) { - String argumentName = argument.getName(); - globalArgumentMap.remove(argumentName); - - Character shortID = argument.getShortIdentifier(); - if (shortID != null) { - globalShortIDMap.remove(shortID); - } - - String longID = argument.getLongIdentifier(); - if (longID != null) { - if (!longArgumentsCaseSensitive()) { - longID = toLowerCase(longID); - } - - globalLongIDMap.remove(longID); - } - - globalArgumentList.remove(argument); - } - /** * Sets the provided argument as one which will automatically trigger the output of full usage information if it is * provided on the command line and no further argument validation will be performed. @@ -445,7 +347,6 @@ public void setUsageHandler(SubCommandUsageHandler subCommandUsageHandler) { */ @Override public void parseArguments(String[] rawArguments, Properties argumentProperties) throws ArgumentException { - setRawArguments(rawArguments); this.subCommand = null; final ArrayList trailingArguments = getTrailingArguments(); trailingArguments.clear(); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index b98fc1976..1dcc3fad0 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -673,7 +673,7 @@ int run(final String[] args) { } if (matchedValuesFilter.isPresent()) { - final LinkedList mvFilterStrings = matchedValuesFilter.getValues(); + final List mvFilterStrings = matchedValuesFilter.getValues(); final List mvFilters = new ArrayList<>(); for (final String s : mvFilterStrings) { try { From 92d82cb3f5423f7bbd6991c59545b180c6f9f69c Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 26 Jan 2016 16:03:07 +0100 Subject: [PATCH 049/125] OPENDJSDK-42 Cli arguments fluent builder PR-45 Create a fluent builder class hierarchy to allow fluent argument creation. * An argument has a mandatory long identifier * The name attribute has been merged with long identifier and removed * Remove useless null checks on argument long identifiers * Change impacted error messages * Create some constants (remove hard coded old lower case argument name) * Now all argument can be set in a property file. The argument property name is always the same as the argument long identifier (i.e can not be set any more) * Default builder values are null for object attributes and false for boolean attributes. * Remove the possiblity to set if an argument needs a value since it was a non hidden implementation detail. * For IntegerArgument default lower bound is Integer.MIN_VALUE and the default upper bound is Integer.MAX_VALUE * Once every needed attributes are contributed, the argument can be created by the builder or added to an argument parser or a subcommand. This commit also includes additional related cleanup. --- .../com/forgerock/opendj/cli/Argument.java | 406 +++++----- .../forgerock/opendj/cli/ArgumentParser.java | 119 +-- .../forgerock/opendj/cli/BooleanArgument.java | 53 +- .../forgerock/opendj/cli/CommandBuilder.java | 2 +- .../forgerock/opendj/cli/CommonArguments.java | 714 +++++++++++------- .../opendj/cli/ConnectionFactoryProvider.java | 9 +- .../opendj/cli/DocDescriptionSupplement.java | 8 - .../opendj/cli/FileBasedArgument.java | 113 +-- .../forgerock/opendj/cli/IntegerArgument.java | 283 ++----- .../opendj/cli/MultiChoiceArgument.java | 200 ++--- .../forgerock/opendj/cli/StringArgument.java | 99 +-- .../com/forgerock/opendj/cli/SubCommand.java | 71 +- .../opendj/cli/SubCommandArgumentParser.java | 59 +- .../com/forgerock/opendj/cli/cli.properties | 31 +- .../forgerock/opendj/ldap/tools/AddRate.java | 83 +- .../forgerock/opendj/ldap/tools/AuthRate.java | 47 +- .../opendj/ldap/tools/LDAPCompare.java | 11 +- .../opendj/ldap/tools/LDAPModify.java | 92 +-- .../opendj/ldap/tools/LDAPPasswordModify.java | 71 +- .../opendj/ldap/tools/LDAPSearch.java | 220 +++--- .../forgerock/opendj/ldap/tools/LDIFDiff.java | 13 +- .../opendj/ldap/tools/LDIFModify.java | 15 +- .../opendj/ldap/tools/LDIFSearch.java | 72 +- .../forgerock/opendj/ldap/tools/MakeLDIF.java | 59 +- .../forgerock/opendj/ldap/tools/ModRate.java | 19 +- .../opendj/ldap/tools/PerformanceRunner.java | 136 ++-- .../opendj/ldap/tools/SearchRate.java | 33 +- 27 files changed, 1479 insertions(+), 1559 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java index 8044d1d9a..9f0d8781b 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java @@ -34,6 +34,7 @@ import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; +import org.forgerock.util.Reject; /** * This class defines a generic argument that may be used in the argument list @@ -41,38 +42,194 @@ * order to provide specific functionality. */ public abstract class Argument implements DocDescriptionSupplement { - /** Indicates whether this argument should be hidden in the usage information. */ - private boolean isHidden; - /** Indicates whether this argument may be specified more than once for multiple values. */ - private boolean isMultiValued; - /** Indicates whether this argument was provided in the set of command-line arguments. */ - private boolean isPresent; - /** Indicates whether this argument is required to have a value. */ - private boolean isRequired; - /** Indicates whether this argument requires a value. */ - private boolean needsValue; - /** The default value for the argument if none other is provided. */ - private String defaultValue; - /** The single-character identifier for this argument. */ - private final Character shortIdentifier; + /** + * An abstract base class to build a generic {@link Argument}. + * + * @param + * The concrete {@link ArgumentBuilder} subclass. + * @param + * The default value type of the {@link Argument}. + * @param + * The concrete {@link Argument} type to build. + */ + static abstract class ArgumentBuilder, T, A extends Argument> { + T defaultValue; + LocalizableMessage description; + LocalizableMessage docDescriptionSupplement; + boolean hidden; + final String longIdentifier; + boolean multiValued; + boolean needsValue = true; + boolean required; + Character shortIdentifier; + LocalizableMessage valuePlaceholder; + + ArgumentBuilder(final String longIdentifier) { + Reject.ifNull(longIdentifier, "An argument must have a long identifier"); + this.longIdentifier = longIdentifier; + } + + abstract B getThis(); + + /** + * Build the argument. + * + * @return The argument built. + * @throws ArgumentException + * If there is a problem with any of the parameters used to + * create this argument. + */ + public abstract A buildArgument() throws ArgumentException; + + /** + * Build the argument and add it to the provided {@link ArgumentParser}. + * + * @param parser + * The argument parser. + * @return The argument built. + * @throws ArgumentException + * If there is a problem with any of the parameters used to + * create this argument. + */ + public A buildAndAddToParser(final ArgumentParser parser) throws ArgumentException { + final A arg = buildArgument(); + parser.addArgument(arg); + return arg; + } + + /** + * Build the argument and add it to the provided {@link SubCommand}. + * + * @param subCommand + * The sub command. + * @return The argument built. + * @throws ArgumentException + * If there is a problem with any of the parameters used to + * create this argument. + */ + public A buildAndAddToSubCommand(final SubCommand subCommand) throws ArgumentException { + final A arg = buildArgument(); + subCommand.addArgument(arg); + return arg; + } + + /** + * Sets this argument default value. + * + * @param defaultValue + * The default value. + * @return This builder. + */ + public B defaultValue(final T defaultValue) { + this.defaultValue = defaultValue; + return getThis(); + } + + /** + * Sets this argument description. + * + * @param description + * The localized description. + * @return This builder. + */ + public B description(final LocalizableMessage description) { + this.description = description; + return getThis(); + } + + /** + * Sets a supplement to the description intended for use in generated reference documentation. + * + * @param docDescriptionSupplement + * The supplement to the description for use in generated reference documentation. + * @return This builder. + */ + public B docDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { + this.docDescriptionSupplement = docDescriptionSupplement; + return getThis(); + } + + /** + * Specifies that this argument is hidden. + * + * @return This builder. + */ + public B hidden() { + this.hidden = true; + return getThis(); + } + + /** + * Specifies that this argument may have multiple values. + * + * @return This builder. + */ + public B multiValued() { + this.multiValued = true; + return getThis(); + } + + /** + * Specifies that this argument is required. + * + * @return This builder. + */ + public B required() { + this.required = true; + return getThis(); + } + + /** + * Sets this argument single-character identifier. + * + * @param shortIdentifier + * The single-character identifier. + * @return This builder. + */ + public B shortIdentifier(final Character shortIdentifier) { + this.shortIdentifier = shortIdentifier; + return getThis(); + } + + /** + * Sets this argument value placeholder, which will be used in usage information. + * + * @param valuePlaceholder + * The localized value placeholder. + * @return This builder. + */ + public B valuePlaceholder(final LocalizableMessage valuePlaceholder) { + this.valuePlaceholder = valuePlaceholder; + return getThis(); + } + } + /** The long identifier for this argument. */ - private final String longIdentifier; + final String longIdentifier; + /** The single-character identifier for this argument. */ + private final Character shortIdentifier; /** The unique ID of the description for this argument. */ private final LocalizableMessage description; + /** Indicates whether this argument should be hidden in the usage information. */ + private final boolean isHidden; + /** Indicates whether this argument may be specified more than once for multiple values. */ + private final boolean isMultiValued; + /** Indicates whether this argument is required to have a value. */ + private final boolean isRequired; + /** Indicates whether this argument requires a value. */ + private final boolean needsValue; + /** The default value for the argument if none other is provided. */ + private final String defaultValue; + /** The value placeholder for this argument, which will be used in usage information. */ + private final LocalizableMessage valuePlaceholder; /** The set of values for this argument. */ private final LinkedList values = new LinkedList<>(); - /** The generic name that will be used to refer to this argument. */ - private final String name; - - /** The name of the property that can be used to set the default value. */ - private String propertyName; - - /** The value placeholder for this argument, which will be used in usage information. */ - private LocalizableMessage valuePlaceholder; + /** Indicates whether this argument was provided in the set of command-line arguments. */ + private boolean isPresent; /** * Indicates whether this argument was provided in the set of @@ -80,71 +237,24 @@ public abstract class Argument implements DocDescriptionSupplement { */ private boolean isValueSetByProperty; - /** - * Creates a new argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - protected Argument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final boolean needsValue, final LocalizableMessage valuePlaceholder, - final String defaultValue, final String propertyName, - final LocalizableMessage description) throws ArgumentException { - this.name = name; - this.shortIdentifier = shortIdentifier; - this.longIdentifier = longIdentifier; - this.isRequired = isRequired; - this.isMultiValued = isMultiValued; - this.needsValue = needsValue; - this.valuePlaceholder = valuePlaceholder; - this.defaultValue = defaultValue; - this.propertyName = propertyName; - this.description = description; - this.isValueSetByProperty = false; - - if (shortIdentifier == null && longIdentifier == null) { - throw new ArgumentException(ERR_ARG_NO_IDENTIFIER.get(name)); - } + , T, A extends Argument> Argument(final ArgumentBuilder builder) + throws ArgumentException { + this.shortIdentifier = builder.shortIdentifier; + this.longIdentifier = builder.longIdentifier; + this.isRequired = builder.required; + this.isMultiValued = builder.multiValued; + this.needsValue = builder.needsValue; + this.valuePlaceholder = builder.valuePlaceholder; + this.defaultValue = builder.defaultValue != null ? String.valueOf(builder.defaultValue) : null; + this.description = builder.description; + this.isHidden = builder.hidden; + this.docDescriptionSupplement = builder.docDescriptionSupplement; if (needsValue && valuePlaceholder == null) { - throw new ArgumentException(ERR_ARG_NO_VALUE_PLACEHOLDER.get(name)); + throw new ArgumentException(ERR_ARG_NO_VALUE_PLACEHOLDER.get(longIdentifier)); } isPresent = false; - isHidden = false; } /** @@ -201,11 +311,6 @@ public LocalizableMessage getDocDescriptionSupplement() { return docDescriptionSupplement != null ? docDescriptionSupplement : LocalizableMessage.EMPTY; } - @Override - public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { - this.docDescriptionSupplement = docDescriptionSupplement; - } - /** * Retrieves the value of this argument as an integer. * @@ -216,19 +321,19 @@ public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionS */ public int getIntValue() throws ArgumentException { if (values.isEmpty()) { - throw new ArgumentException(ERR_ARG_NO_INT_VALUE.get(name)); + throw new ArgumentException(ERR_ARG_NO_INT_VALUE.get(longIdentifier)); } final Iterator iterator = values.iterator(); final String valueString = iterator.next(); if (iterator.hasNext()) { - throw new ArgumentException(ERR_ARG_INT_MULTIPLE_VALUES.get(name)); + throw new ArgumentException(ERR_ARG_INT_MULTIPLE_VALUES.get(longIdentifier)); } try { return Integer.parseInt(valueString); } catch (final Exception e) { - throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, name), e); + throw new ArgumentException(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, longIdentifier), e); } } @@ -243,29 +348,6 @@ public String getLongIdentifier() { return longIdentifier; } - /** - * Retrieves the generic name that will be used to refer to this argument. - * - * @return The generic name that will be used to refer to this argument. - */ - public String getName() { - return name; - } - - /** - * Retrieves the name of a property in a properties file that may be used to - * set the default value for this argument if it is present. A value read - * from a properties file will override the default value returned from the - * getDefaultValue, but the properties file value will be - * overridden by a value supplied on the command line. - * - * @return The name of a property in a properties file that may be used to - * set the default value for this argument if it is present. - */ - public String getPropertyName() { - return propertyName; - } - /** * Retrieves the single-character identifier that may be used to specify the * value of this argument. @@ -387,44 +469,6 @@ public boolean needsValue() { return needsValue; } - /** - * Specifies the default value that will be used for this argument if it is - * not specified on the command line and it is not set from a properties - * file. - * - * @param defaultValue - * The default value that will be used for this argument if it is - * not specified on the command line and it is not set from a - * properties file. - */ - public void setDefaultValue(final String defaultValue) { - this.defaultValue = defaultValue; - } - - /** - * Specifies whether this argument should be hidden from the usage - * information. - * - * @param isHidden - * Indicates whether this argument should be hidden from the - * usage information. - */ - public void setHidden(final boolean isHidden) { - this.isHidden = isHidden; - } - - /** - * Specifies whether this argument may be provided more than once on the - * command line to specify multiple values. - * - * @param isMultiValued - * Indicates whether this argument may be provided more than once - * on the command line to specify multiple values. - */ - public void setMultiValued(final boolean isMultiValued) { - this.isMultiValued = isMultiValued; - } - /** * Specifies whether this argument is present in the parsed set of * command-line arguments. @@ -437,52 +481,8 @@ public void setPresent(final boolean isPresent) { this.isPresent = isPresent; } - /** - * Specifies the name of a property in a properties file that may be used to - * set the default value for this argument if it is present. - * - * @param propertyName - * The name of a property in a properties file that may be used - * to set the default value for this argument if it is present. - */ - public void setPropertyName(final String propertyName) { - this.propertyName = propertyName; - } - - /** - * Specifies whether this argument is required to have at least one value. - * - * @param isRequired - * Indicates whether this argument is required to have at least - * one value. - */ - public void setRequired(final boolean isRequired) { - this.isRequired = isRequired; - } - - /** - * Specifies the value placeholder that will be displayed for this argument - * in the generated usage information. It may be null only if - * needsValue() returns false. - * - * @param valuePlaceholder - * The value placeholder that will be displayed for this argument - * in the generated usage information. - */ - public void setValuePlaceholder(final LocalizableMessage valuePlaceholder) { - this.valuePlaceholder = valuePlaceholder; - } - - /** - * Specifies whether this argument was provided in the set of properties - * found is a properties file. - * - * @param isValueSetByProperty - * Specify whether this argument was provided in the set of - * properties found is a properties file. - */ - public void setValueSetByProperty(final boolean isValueSetByProperty) { - this.isValueSetByProperty = isValueSetByProperty; + void valueSetByProperty() { + isValueSetByProperty = true; } /** @@ -519,4 +519,14 @@ public String toString() { sb.append(")"); return sb.toString(); } + + @Override + public boolean equals(final Object arg) { + return this == arg || (arg instanceof Argument && ((Argument) arg).longIdentifier.equals(this.longIdentifier)); + } + + @Override + public int hashCode() { + return longIdentifier.hashCode(); + } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java index 0cfac0cfa..9018fc231 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java @@ -38,10 +38,12 @@ import java.io.PrintStream; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Comparator; import java.util.Date; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.Locale; @@ -68,6 +70,15 @@ public class ArgumentParser implements ToolRefDocContainer { private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); + + private static final Set HOST_LONG_IDENTIFIERS = new HashSet<>(Arrays.asList( + OPTION_LONG_HOST, + OPTION_LONG_REFERENCED_HOST_NAME, + "host1", + "host2", + "hostSource", + "hostDestination")); + /** * The name of the OpenDJ configuration direction in the user home * directory. @@ -286,9 +297,9 @@ public void addArgument(final Argument argument) throws ArgumentException { public void addArgument(final Argument argument, ArgumentGroup group) throws ArgumentException { final Character shortID = argument.getShortIdentifier(); if (shortID != null && shortIDMap.containsKey(shortID)) { - final String conflictingName = shortIDMap.get(shortID).getName(); + final String conflictingID = shortIDMap.get(shortID).getLongIdentifier(); throw new ArgumentException( - ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(argument.getName(), shortID, conflictingName)); + ERR_ARGPARSER_DUPLICATE_SHORT_ID.get(argument.getLongIdentifier(), shortID, conflictingID)); } // JNR: what is the requirement for the following code? @@ -305,16 +316,9 @@ public void addArgument(final Argument argument, ArgumentGroup group) throws Arg } } - String longID = argument.getLongIdentifier(); - if (longID != null) { - if (!longArgumentsCaseSensitive) { - longID = toLowerCase(longID); - } - if (longIDMap.containsKey(longID)) { - final String conflictingName = longIDMap.get(longID).getName(); - throw new ArgumentException(ERR_ARGPARSER_DUPLICATE_LONG_ID.get( - argument.getName(), argument.getLongIdentifier(), conflictingName)); - } + final String longID = formatLongIdentifier(argument.getLongIdentifier()); + if (longIDMap.containsKey(longID)) { + throw new ArgumentException(ERR_ARGPARSER_DUPLICATE_LONG_ID.get(argument.getLongIdentifier())); } if (shortID != null) { @@ -335,8 +339,10 @@ public void addArgument(final Argument argument, ArgumentGroup group) throws Arg } private BooleanArgument getVersionArgument(final boolean displayShortIdentifier) throws ArgumentException { - return new BooleanArgument(OPTION_LONG_PRODUCT_VERSION, displayShortIdentifier ? OPTION_SHORT_PRODUCT_VERSION - : null, OPTION_LONG_PRODUCT_VERSION, INFO_DESCRIPTION_PRODUCT_VERSION.get()); + return BooleanArgument.builder(OPTION_LONG_PRODUCT_VERSION) + .shortIdentifier(displayShortIdentifier ? OPTION_SHORT_PRODUCT_VERSION : null) + .description(INFO_DESCRIPTION_PRODUCT_VERSION.get()) + .buildArgument(); } /** @@ -459,7 +465,7 @@ Properties checkExternalProperties() throws ArgumentException { * null if there is no such argument. */ public Argument getArgumentForLongID(final String longID) { - return longIDMap.get(longID); + return longIDMap.get(formatLongIdentifier(longID)); } /** @@ -531,7 +537,7 @@ public void setShortToolDescription(final LocalizableMessage shortDescription) { * A supplement to the description for this tool * intended for use in generated reference documentation. */ - private DocDescriptionSupplement docToolDescriptionSupplement; + private DocSubcommandDescriptionSupplement docToolDescriptionSupplement; @Override public LocalizableMessage getDocToolDescriptionSupplement() { @@ -551,7 +557,7 @@ public void setDocToolDescriptionSupplement(final LocalizableMessage supplement) * A supplement to the description for all subcommands of this tool, * intended for use in generated reference documentation. */ - private class DocSubcommandsDescriptionSupplement implements DocDescriptionSupplement { + private class DocSubcommandDescriptionSupplement implements DocDescriptionSupplement { /** A supplement to the description intended for use in generated reference documentation. */ private LocalizableMessage docDescriptionSupplement; @@ -560,13 +566,12 @@ public LocalizableMessage getDocDescriptionSupplement() { return docDescriptionSupplement != null ? docDescriptionSupplement : LocalizableMessage.EMPTY; } - @Override - public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { + private void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { this.docDescriptionSupplement = docDescriptionSupplement; } } - private DocDescriptionSupplement docSubcommandsDescriptionSupplement; + private DocSubcommandDescriptionSupplement docSubcommandsDescriptionSupplement; @Override public LocalizableMessage getDocSubcommandsDescriptionSupplement() { @@ -582,11 +587,11 @@ public void setDocSubcommandsDescriptionSupplement(final LocalizableMessage supp this.docSubcommandsDescriptionSupplement.setDocDescriptionSupplement(supplement); } - private DocDescriptionSupplement constructIfNull(DocDescriptionSupplement supplement) { + private DocSubcommandDescriptionSupplement constructIfNull(DocSubcommandDescriptionSupplement supplement) { if (supplement != null) { return supplement; } - return new DocSubcommandsDescriptionSupplement(); + return new DocSubcommandDescriptionSupplement(); } /** @@ -708,15 +713,15 @@ protected String getOptionsRefSect1(String scriptName) { continue; } - // Return a generic FQDN for localhost as the default hostname - // in reference documentation. + final Map argumentMap = getArgumentMap(a); + // Return a generic FQDN for localhost as the default hostname in reference documentation. if (isHostNameArgument(a)) { - a.setDefaultValue("localhost.localdomain"); + argumentMap.put("default", REF_DEFAULT.get("localhost.localdomain")); } // Return a generic message as default backend type depends on the server distribution. - if (a.getName().equalsIgnoreCase(OPTION_LONG_BACKEND_TYPE)) { - a.setDefaultValue(REF_DEFAULT_BACKEND_TYPE.get().toString()); + if (a.getLongIdentifier().equals(OPTION_LONG_BACKEND_TYPE)) { + argumentMap.put("default", REF_DEFAULT_BACKEND_TYPE.get().toString()); } // The help argument should be added at the end. @@ -725,7 +730,7 @@ protected String getOptionsRefSect1(String scriptName) { continue; } - options.add(getArgumentMap(a)); + options.add(argumentMap); } group.put("options", options); if (!options.isEmpty()) { @@ -753,13 +758,7 @@ protected String getOptionsRefSect1(String scriptName) { * @return true if this argument is for setting a hostname. */ boolean isHostNameArgument(final Argument a) { - final String name = a.getName(); - return name.equalsIgnoreCase(OPTION_LONG_HOST) - || name.equalsIgnoreCase(OPTION_LONG_REFERENCED_HOST_NAME) - || name.equalsIgnoreCase("host1") - || name.equalsIgnoreCase("host2") - || name.equalsIgnoreCase("hostSource") - || name.equalsIgnoreCase("hostDestination"); + return HOST_LONG_IDENTIFIERS.contains(a.getLongIdentifier()); } /** @@ -948,7 +947,7 @@ Argument getUsageArgument() { * @return true if the provided argument is the usage argument, false otherwise */ boolean isUsageArgument(final Argument a) { - return usageArgument != null && usageArgument.getName().equals(a.getName()); + return usageArgument != null && usageArgument.getLongIdentifier().equals(a.getLongIdentifier()); } /** Prints the version. */ @@ -1063,9 +1062,7 @@ public void parseArguments(final String[] rawArguments, Properties argumentPrope // If we're not case-sensitive, then convert the name to lowercase. final String origArgName = argName; - if (!longArgumentsCaseSensitive) { - argName = toLowerCase(argName); - } + argName = formatLongIdentifier(argName); // Get the argument with the specified name. final Argument a = longIDMap.get(argName); @@ -1579,10 +1576,9 @@ void printLineForShortLongArgument(final Argument a, final StringBuilder buffer) void normalizeArguments(final Properties argumentProperties, final List arguments) throws ArgumentException { for (final Argument a : arguments) { - if (!a.isPresent() - // See if there is a value in the properties that can be used - && argumentProperties != null && a.getPropertyName() != null) { - final String value = argumentProperties.getProperty(a.getPropertyName().toLowerCase()); + // See if there is a value in the properties that can be used + if (!a.isPresent() && argumentProperties != null) { + final String value = argumentProperties.getProperty(a.getLongIdentifier().toLowerCase()); final LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder(); if (value != null) { boolean addValue = (a instanceof BooleanArgument) || a.valueIsAcceptable(value, invalidReason); @@ -1591,7 +1587,7 @@ void normalizeArguments(final Properties argumentProperties, final List longIDToArg, + final Map shortIDToArg, final List argumentList, final Argument argument) { + final String longID = formatLongIdentifier(argument.getLongIdentifier()); + if (!longIDToArg.containsKey(longID)) { + return; + } + longIDToArg.put(longID, argument); + shortIDToArg.put(argument.getShortIdentifier(), argument); + argumentList.remove(argument); + argumentList.add(argument); + for (final ArgumentGroup group : argumentGroups) { + if (group.getArguments().contains(argument)) { + group.removeArgument(argument); + group.addArgument(argument); + } + } + } + + String formatLongIdentifier(final String longIdentifier) { + return longArgumentsCaseSensitive ? longIdentifier : toLowerCase(longIdentifier); + } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java index 55a8ec958..442546966 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java @@ -28,7 +28,6 @@ import static com.forgerock.opendj.cli.CliMessages.ERR_BOOLEANARG_NO_VALUE_ALLOWED; -import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; /** @@ -39,32 +38,42 @@ * default value will always be "false". */ public final class BooleanArgument extends Argument { + /** - * Creates a new Boolean argument with the provided information. + * Returns a builder which can be used for incrementally constructing a new + * {@link BooleanArgument}. * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. + * The long identifier that will be used to refer to this argument. + * @return A builder to continue building the {@link BooleanArgument}. */ - public BooleanArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, false, false, false, null, String - .valueOf(false), null, description); + public static Builder builder(final String longIdentifier) { + return new Builder(longIdentifier); + } + + /** A fluent API for incrementally constructing {@link BooleanArgument}. */ + public static final class Builder extends ArgumentBuilder { + private Builder(final String longIdentifier) { + super(longIdentifier); + this.needsValue = false; + this.defaultValue = false; + } + + @Override + Builder getThis() { + return this; + } + + @Override + public BooleanArgument buildArgument() throws ArgumentException { + return new BooleanArgument(this); + } + } + + private BooleanArgument(final Builder builder) throws ArgumentException { + super(builder); } - /** {@inheritDoc} */ @Override public final void addValue(final String valueString) { if (valueString != null) { @@ -83,7 +92,7 @@ public final void setPresent(final boolean isPresent) { public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { // This argument type should never have a value, so any value // provided will be unacceptable. - invalidReason.append(ERR_BOOLEANARG_NO_VALUE_ALLOWED.get(getName())); + invalidReason.append(ERR_BOOLEANARG_NO_VALUE_ALLOWED.get(longIdentifier)); return false; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java index c37ad311e..d9fb2694a 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java @@ -175,7 +175,7 @@ private String toString(final boolean showObfuscated, final String lineSeparator for (final Argument arg : args) { // This CLI is always using SSL, and the argument has been removed from // the user interface - if ("useSSL".equals(arg.getName())) { + if (ArgumentConstants.OPTION_LONG_USE_SSL.equals(arg.getLongIdentifier())) { continue; } String argName; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index c5502f24d..bbd445384 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -50,8 +50,10 @@ private CommonArguments() { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getShowUsage() throws ArgumentException { - return new BooleanArgument(OPTION_LONG_HELP.toLowerCase(), OPTION_SHORT_HELP, OPTION_LONG_HELP, - INFO_DESCRIPTION_SHOWUSAGE.get()); + return BooleanArgument.builder(OPTION_LONG_HELP) + .shortIdentifier(OPTION_SHORT_HELP) + .description(INFO_DESCRIPTION_SHOWUSAGE.get()) + .buildArgument(); } /** @@ -62,10 +64,10 @@ public static BooleanArgument getShowUsage() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getVerbose() throws ArgumentException { - final BooleanArgument verbose = new BooleanArgument(OPTION_LONG_VERBOSE.toLowerCase(), OPTION_SHORT_VERBOSE, - OPTION_LONG_VERBOSE, INFO_DESCRIPTION_VERBOSE.get()); - verbose.setPropertyName("verbose"); - return verbose; + return BooleanArgument.builder(OPTION_LONG_VERBOSE) + .shortIdentifier(OPTION_SHORT_VERBOSE) + .description(INFO_DESCRIPTION_VERBOSE.get()) + .buildArgument(); } /** @@ -96,9 +98,13 @@ public static IntegerArgument getPort(final int defaultPort) throws ArgumentExce */ public static IntegerArgument getPort(final int defaultPort, final LocalizableMessage description) throws ArgumentException { - return new IntegerArgument(OPTION_LONG_PORT.toLowerCase(), OPTION_SHORT_PORT, OPTION_LONG_PORT, false, false, - true, INFO_PORT_PLACEHOLDER.get(), defaultPort, OPTION_LONG_PORT, true, 1, true, 65535, - description != null ? description : INFO_DESCRIPTION_ADMIN_PORT.get()); + return IntegerArgument.builder(OPTION_LONG_PORT) + .shortIdentifier(OPTION_SHORT_PORT) + .description(description != null ? description : INFO_DESCRIPTION_ADMIN_PORT.get()) + .range(1, 65535) + .defaultValue(defaultPort) + .valuePlaceholder(INFO_PORT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -109,8 +115,10 @@ public static IntegerArgument getPort(final int defaultPort, final LocalizableMe * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getPropertiesFile() throws ArgumentException { - return new StringArgument(OPTION_LONG_PROP_FILE_PATH.toLowerCase(), null, OPTION_LONG_PROP_FILE_PATH, false, - false, true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_PROP_FILE_PATH.get()); + return StringArgument.builder(OPTION_LONG_PROP_FILE_PATH) + .description(INFO_DESCRIPTION_PROP_FILE_PATH.get()) + .valuePlaceholder(INFO_PROP_FILE_PATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -121,9 +129,11 @@ public static StringArgument getPropertiesFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getProxyAuthId() throws ArgumentException { - return new StringArgument("proxyauthzid", OPTION_SHORT_PROXYAUTHID, OPTION_LONG_PROXYAUTHID, false, false, - true, INFO_PROXYAUTHID_PLACEHOLDER.get(), null, OPTION_LONG_PROXYAUTHID, - INFO_DESCRIPTION_PROXYAUTHZID.get()); + return StringArgument.builder(OPTION_LONG_PROXYAUTHID) + .shortIdentifier(OPTION_SHORT_PROXYAUTHID) + .description(INFO_DESCRIPTION_PROXYAUTHZID.get()) + .valuePlaceholder(INFO_PROXYAUTHID_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -134,8 +144,9 @@ public static StringArgument getProxyAuthId() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getNoPropertiesFile() throws ArgumentException { - return new BooleanArgument(OPTION_LONG_NO_PROP_FILE.toLowerCase(), null, OPTION_LONG_NO_PROP_FILE, - INFO_DESCRIPTION_NO_PROP_FILE.get()); + return BooleanArgument.builder(OPTION_LONG_NO_PROP_FILE) + .description(INFO_DESCRIPTION_NO_PROP_FILE.get()) + .buildArgument(); } /** @@ -147,10 +158,10 @@ public static BooleanArgument getNoPropertiesFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getContinueOnError() throws ArgumentException { - final BooleanArgument continueOnError = new BooleanArgument("continueOnError", 'c', "continueOnError", - INFO_DESCRIPTION_CONTINUE_ON_ERROR.get()); - continueOnError.setPropertyName("continueOnError"); - return continueOnError; + return BooleanArgument.builder("continueOnError") + .shortIdentifier('c') + .description(INFO_DESCRIPTION_CONTINUE_ON_ERROR.get()) + .buildArgument(); } /** @@ -161,12 +172,13 @@ public static BooleanArgument getContinueOnError() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getControl() throws ArgumentException { - StringArgument controlStr = - new StringArgument(OPTION_LONG_CONTROL.toLowerCase(), OPTION_SHORT_CONTROL, OPTION_LONG_CONTROL, false, - true, true, INFO_LDAP_CONTROL_PLACEHOLDER.get(), null, OPTION_LONG_CONTROL, - INFO_DESCRIPTION_CONTROLS.get()); - controlStr.setDocDescriptionSupplement(SUPPLEMENT_DESCRIPTION_CONTROLS.get()); - return controlStr; + return StringArgument.builder(OPTION_LONG_CONTROL) + .shortIdentifier(OPTION_SHORT_CONTROL) + .description(INFO_DESCRIPTION_CONTROLS.get()) + .docDescriptionSupplement(SUPPLEMENT_DESCRIPTION_CONTROLS.get()) + .multiValued() + .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -177,9 +189,12 @@ public static StringArgument getControl() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getLdapVersion() throws ArgumentException { - return new IntegerArgument(OPTION_LONG_PROTOCOL_VERSION.toLowerCase(), OPTION_SHORT_PROTOCOL_VERSION, - OPTION_LONG_PROTOCOL_VERSION, false, false, true, INFO_PROTOCOL_VERSION_PLACEHOLDER.get(), 3, - OPTION_LONG_PROTOCOL_VERSION, INFO_DESCRIPTION_VERSION.get()); + return IntegerArgument.builder(OPTION_LONG_PROTOCOL_VERSION) + .shortIdentifier(OPTION_SHORT_PROTOCOL_VERSION) + .description(INFO_DESCRIPTION_VERSION.get()) + .defaultValue(3) + .valuePlaceholder(INFO_PROTOCOL_VERSION_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -190,11 +205,10 @@ public static IntegerArgument getLdapVersion() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getQuiet() throws ArgumentException { - final BooleanArgument quiet = new BooleanArgument(OPTION_LONG_QUIET, OPTION_SHORT_QUIET, OPTION_LONG_QUIET, - INFO_DESCRIPTION_QUIET.get()); - quiet.setPropertyName(OPTION_LONG_QUIET); - return quiet; - + return BooleanArgument.builder(OPTION_LONG_QUIET) + .shortIdentifier(OPTION_SHORT_QUIET) + .description(INFO_DESCRIPTION_QUIET.get()) + .buildArgument(); } /** @@ -206,7 +220,10 @@ public static BooleanArgument getQuiet() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getNoOp() throws ArgumentException { - return new BooleanArgument("no-op", OPTION_SHORT_DRYRUN, OPTION_LONG_DRYRUN, INFO_DESCRIPTION_NOOP.get()); + return BooleanArgument.builder(OPTION_LONG_DRYRUN) + .shortIdentifier(OPTION_SHORT_DRYRUN) + .description(INFO_DESCRIPTION_NOOP.get()) + .buildArgument(); } /** @@ -218,8 +235,10 @@ public static BooleanArgument getNoOp() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getNoPrompt() throws ArgumentException { - return new BooleanArgument(OPTION_LONG_NO_PROMPT, OPTION_SHORT_NO_PROMPT, OPTION_LONG_NO_PROMPT, - INFO_DESCRIPTION_NO_PROMPT.get()); + return BooleanArgument.builder(OPTION_LONG_NO_PROMPT) + .shortIdentifier(OPTION_SHORT_NO_PROMPT) + .description(INFO_DESCRIPTION_NO_PROMPT.get()) + .buildArgument(); } /** @@ -230,8 +249,9 @@ public static BooleanArgument getNoPrompt() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getAcceptLicense() throws ArgumentException { - return new BooleanArgument(OPTION_LONG_ACCEPT_LICENSE, null, OPTION_LONG_ACCEPT_LICENSE, - INFO_OPTION_ACCEPT_LICENSE.get()); + return BooleanArgument.builder(OPTION_LONG_ACCEPT_LICENSE) + .description(INFO_OPTION_ACCEPT_LICENSE.get()) + .buildArgument(); } /** @@ -244,8 +264,13 @@ public static BooleanArgument getAcceptLicense() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getTimeLimit() throws ArgumentException { - return new IntegerArgument("timelimit", 't', "timeLimit", false, false, true, - INFO_TIME_LIMIT_PLACEHOLDER.get(), 0, null, true, 0, false, 0, INFO_DESCRIPTION_TIME_LIMIT.get()); + return IntegerArgument.builder("timeLimit") + .shortIdentifier('t') + .description(INFO_DESCRIPTION_TIME_LIMIT.get()) + .lowerBound(0) + .defaultValue(0) + .valuePlaceholder(INFO_TIME_LIMIT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -256,10 +281,10 @@ public static IntegerArgument getTimeLimit() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getTrustAll() throws ArgumentException { - final BooleanArgument trustAll = new BooleanArgument(OPTION_LONG_TRUSTALL, OPTION_SHORT_TRUSTALL, - OPTION_LONG_TRUSTALL, INFO_DESCRIPTION_TRUSTALL.get()); - trustAll.setPropertyName(OPTION_LONG_TRUSTALL); - return trustAll; + return BooleanArgument.builder(OPTION_LONG_TRUSTALL) + .shortIdentifier(OPTION_SHORT_TRUSTALL) + .description(INFO_DESCRIPTION_TRUSTALL.get()) + .buildArgument(); } /** @@ -272,9 +297,11 @@ public static BooleanArgument getTrustAll() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getTrustManagerProviderDN() throws ArgumentException { - return new StringArgument("trustmanagerproviderdn", 't', "trustManagerProviderDN", false, false, true, - INFO_TRUST_MANAGER_PROVIDER_DN_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN.get()); + return StringArgument.builder("trustManagerProviderDN") + .shortIdentifier('t') + .description(INFO_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN.get()) + .valuePlaceholder(INFO_TRUST_MANAGER_PROVIDER_DN_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -285,9 +312,25 @@ public static StringArgument getTrustManagerProviderDN() throws ArgumentExceptio * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getTrustStorePath() throws ArgumentException { - return new StringArgument("trustStorePath", OPTION_SHORT_TRUSTSTOREPATH, OPTION_LONG_TRUSTSTOREPATH, false, - false, true, INFO_TRUSTSTOREPATH_PLACEHOLDER.get(), null, OPTION_LONG_TRUSTSTOREPATH, - INFO_DESCRIPTION_TRUSTSTOREPATH.get()); + return getTrustStorePath(null); + } + + /** + * Returns the "trustStorePath" string argument initialized with the provided default value. + * + * @param defaultValue + * The "trustStorePath" argument default value + * @return The "trustStorePath" string argument initialized with the provided default value. + * @throws ArgumentException + * If there is a problem with any of the parameters used to create this argument. + */ + public static StringArgument getTrustStorePath(final String defaultValue) throws ArgumentException { + return StringArgument.builder(OPTION_LONG_TRUSTSTOREPATH) + .shortIdentifier(OPTION_SHORT_TRUSTSTOREPATH) + .description(INFO_DESCRIPTION_TRUSTSTOREPATH.get()) + .defaultValue(defaultValue) + .valuePlaceholder(INFO_TRUSTSTOREPATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -298,10 +341,10 @@ public static StringArgument getTrustStorePath() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getTypesOnly() throws ArgumentException { - final BooleanArgument typesOnly = new BooleanArgument("typesOnly", 'A', "typesOnly", - INFO_DESCRIPTION_TYPES_ONLY.get()); - typesOnly.setPropertyName("typesOnly"); - return typesOnly; + return BooleanArgument.builder("typesOnly") + .shortIdentifier('A') + .description(INFO_DESCRIPTION_TYPES_ONLY.get()) + .buildArgument(); } /** @@ -312,9 +355,11 @@ public static BooleanArgument getTypesOnly() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getTrustStorePassword() throws ArgumentException { - return new StringArgument("truststorepw", OPTION_SHORT_TRUSTSTORE_PWD, OPTION_LONG_TRUSTSTORE_PWD, false, - false, true, INFO_TRUSTSTORE_PWD_PLACEHOLDER.get(), null, OPTION_LONG_TRUSTSTORE_PWD, - INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get()); + return StringArgument.builder(OPTION_LONG_TRUSTSTORE_PWD) + .shortIdentifier(OPTION_SHORT_TRUSTSTORE_PWD) + .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get()) + .valuePlaceholder(INFO_TRUSTSTORE_PWD_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -325,28 +370,49 @@ public static StringArgument getTrustStorePassword() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static FileBasedArgument getTrustStorePasswordFile() throws ArgumentException { - return new FileBasedArgument("trustStorePasswordFile", OPTION_SHORT_TRUSTSTORE_PWD_FILE, - OPTION_LONG_TRUSTSTORE_PWD_FILE, false, false, INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER.get(), null, - OPTION_LONG_TRUSTSTORE_PWD_FILE, INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get()); + return FileBasedArgument.builder(OPTION_LONG_TRUSTSTORE_PWD_FILE) + .shortIdentifier(OPTION_SHORT_TRUSTSTORE_PWD_FILE) + .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get()) + .valuePlaceholder(INFO_TRUSTSTORE_PWD_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** - * Returns the "connectTimeout" integer argument. + * Returns a "connectTimeout" hidden integer argument. * - * @return The "connectTimeout" argument. + * @return A "connectTimeout" hidden integer argument. + * @throws ArgumentException + * If there is a problem with any of the parameters used to create this argument. + */ + public static IntegerArgument getConnectTimeOutHidden() throws ArgumentException { + return getConnectTimeOut(true); + } + + /** + * Returns a "connectTimeout" integer argument. + * + * @return A "connectTimeout" integer argument. * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getConnectTimeOut() throws ArgumentException { - final IntegerArgument connectTimeout = new IntegerArgument(OPTION_LONG_CONNECT_TIMEOUT, null, - OPTION_LONG_CONNECT_TIMEOUT, false, false, true, INFO_TIMEOUT_PLACEHOLDER.get(), - DEFAULT_LDAP_CONNECT_TIMEOUT, null, true, 0, false, Integer.MAX_VALUE, - INFO_DESCRIPTION_CONNECTION_TIMEOUT.get()); - connectTimeout.setPropertyName(OPTION_LONG_CONNECT_TIMEOUT); - connectTimeout.setHidden(true); - return connectTimeout; + return getConnectTimeOut(false); } + private static IntegerArgument getConnectTimeOut(final boolean hidden) throws ArgumentException { + final IntegerArgument.Builder builder = IntegerArgument.builder(OPTION_LONG_CONNECT_TIMEOUT) + .description(INFO_DESCRIPTION_CONNECTION_TIMEOUT.get()) + .lowerBound(0) + .defaultValue(DEFAULT_LDAP_CONNECT_TIMEOUT) + .valuePlaceholder(INFO_TIMEOUT_PLACEHOLDER.get()); + if (hidden) { + builder.hidden(); + } + return builder.buildArgument(); + } + + + /** * Returns the "cleanupservice" string argument.
* N.B : the 'c' short option is also used by continueOnError, compress. @@ -356,9 +422,11 @@ public static IntegerArgument getConnectTimeOut() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getCleanupService() throws ArgumentException { - return new StringArgument("cleanupservice", 'c', "cleanupService", false, false, true, - INFO_SERVICE_NAME_PLACEHOLDER.get(), null, null, - INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP.get()); + return StringArgument.builder("cleanupService") + .shortIdentifier('c') + .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP.get()) + .valuePlaceholder(INFO_SERVICE_NAME_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -370,10 +438,10 @@ public static StringArgument getCleanupService() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getCLI() throws ArgumentException { - final BooleanArgument cli = new BooleanArgument(OPTION_LONG_CLI.toLowerCase(), OPTION_SHORT_CLI, - OPTION_LONG_CLI, INFO_ARGUMENT_DESCRIPTION_CLI.get()); - cli.setPropertyName(OPTION_LONG_CLI); - return cli; + return BooleanArgument.builder(OPTION_LONG_CLI) + .shortIdentifier(OPTION_SHORT_CLI) + .description(INFO_ARGUMENT_DESCRIPTION_CLI.get()) + .buildArgument(); } /** @@ -385,9 +453,13 @@ public static BooleanArgument getCLI() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getConfigFile() throws ArgumentException { - final StringArgument configFile = new StringArgument("configfile", 'f', "configFile", true, false, true, - INFO_CONFIGFILE_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_CONFIG_FILE.get()); - configFile.setHidden(true); + final StringArgument configFile = StringArgument.builder("configFile") + .shortIdentifier('f') + .description(INFO_DESCRIPTION_CONFIG_FILE.get()) + .hidden() + .required() + .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get()) + .buildArgument(); return configFile; } @@ -401,11 +473,14 @@ public static StringArgument getConfigFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getConfigClass(final String configFileHandlerName) throws ArgumentException { - final StringArgument configClass = new StringArgument("configclass", OPTION_SHORT_CONFIG_CLASS, - OPTION_LONG_CONFIG_CLASS, true, false, true, INFO_CONFIGCLASS_PLACEHOLDER.get(), configFileHandlerName, - null, INFO_DESCRIPTION_CONFIG_CLASS.get()); - configClass.setHidden(true); - return configClass; + return StringArgument.builder(OPTION_LONG_CONFIG_CLASS) + .shortIdentifier(OPTION_SHORT_CONFIG_CLASS) + .description(INFO_DESCRIPTION_CONFIG_CLASS.get()) + .hidden() + .required() + .defaultValue(configFileHandlerName) + .valuePlaceholder(INFO_CONFIGCLASS_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -417,8 +492,12 @@ public static StringArgument getConfigClass(final String configFileHandlerName) * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBackendId() throws ArgumentException { - return new StringArgument("backendid", 'n', "backendID", false, true, true, INFO_BACKENDNAME_PLACEHOLDER.get(), - null, null, INFO_BACKUPDB_DESCRIPTION_BACKEND_ID.get()); + return StringArgument.builder("backendID") + .shortIdentifier('n') + .description(INFO_BACKUPDB_DESCRIPTION_BACKEND_ID.get()) + .multiValued() + .valuePlaceholder(INFO_BACKENDNAME_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -430,8 +509,12 @@ public static StringArgument getBackendId() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBackupDirectory() throws ArgumentException { - return new StringArgument("backupdirectory", 'd', "backupDirectory", true, false, true, - INFO_BACKUPDIR_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_BACKUP_DIR.get()); + return StringArgument.builder("backupDirectory") + .shortIdentifier('d') + .description(INFO_DESCRIPTION_BACKUP_DIR.get()) + .required() + .valuePlaceholder(INFO_BACKUPDIR_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -442,9 +525,12 @@ public static StringArgument getBackupDirectory() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBaseDN() throws ArgumentException { - return new StringArgument(OPTION_LONG_BASEDN.toLowerCase(), OPTION_SHORT_BASEDN, OPTION_LONG_BASEDN, false, - true, true, INFO_BASEDN_PLACEHOLDER.get(), null, OPTION_LONG_BASEDN, - INFO_ARGUMENT_DESCRIPTION_BASEDN.get()); + return StringArgument.builder(OPTION_LONG_BASEDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_ARGUMENT_DESCRIPTION_BASEDN.get()) + .multiValued() + .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -455,9 +541,11 @@ public static StringArgument getBaseDN() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBatchFilePath() throws ArgumentException { - return new StringArgument(OPTION_LONG_BATCH_FILE_PATH, OPTION_SHORT_BATCH_FILE_PATH, - OPTION_LONG_BATCH_FILE_PATH, false, false, true, INFO_BATCH_FILE_PATH_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_BATCH_FILE_PATH.get()); + return StringArgument.builder(OPTION_LONG_BATCH_FILE_PATH) + .shortIdentifier(OPTION_SHORT_BATCH_FILE_PATH) + .description(INFO_DESCRIPTION_BATCH_FILE_PATH.get()) + .valuePlaceholder(INFO_BATCH_FILE_PATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -471,8 +559,12 @@ public static StringArgument getBatchFilePath() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBindDN(final String defaultBindDN) throws ArgumentException { - return new StringArgument("bindDN", OPTION_SHORT_BINDDN, OPTION_LONG_BINDDN, false, false, true, - INFO_BINDDN_PLACEHOLDER.get(), defaultBindDN, OPTION_LONG_BINDDN, INFO_DESCRIPTION_BINDDN.get()); + return StringArgument.builder(OPTION_LONG_BINDDN) + .shortIdentifier(OPTION_SHORT_BINDDN) + .description(INFO_DESCRIPTION_BINDDN.get()) + .defaultValue(defaultBindDN) + .valuePlaceholder(INFO_BINDDN_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -483,8 +575,11 @@ public static StringArgument getBindDN(final String defaultBindDN) throws Argume * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getBindPassword() throws ArgumentException { - return new StringArgument("bindPassword", OPTION_SHORT_BINDPWD, OPTION_LONG_BINDPWD, false, false, true, - INFO_BINDPWD_PLACEHOLDER.get(), null, OPTION_LONG_BINDPWD, INFO_DESCRIPTION_BINDPASSWORD.get()); + return StringArgument.builder(OPTION_LONG_BINDPWD) + .shortIdentifier(OPTION_SHORT_BINDPWD) + .description(INFO_DESCRIPTION_BINDPASSWORD.get()) + .valuePlaceholder(INFO_BINDPWD_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -495,9 +590,11 @@ public static StringArgument getBindPassword() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static FileBasedArgument getBindPasswordFile() throws ArgumentException { - return new FileBasedArgument("bindPasswordFile", OPTION_SHORT_BINDPWD_FILE, OPTION_LONG_BINDPWD_FILE, false, - false, INFO_BINDPWD_FILE_PLACEHOLDER.get(), null, OPTION_LONG_BINDPWD_FILE, - INFO_DESCRIPTION_BINDPASSWORDFILE.get()); + return FileBasedArgument.builder(OPTION_LONG_BINDPWD_FILE) + .shortIdentifier(OPTION_SHORT_BINDPWD_FILE) + .description(INFO_DESCRIPTION_BINDPASSWORDFILE.get()) + .valuePlaceholder(INFO_BINDPWD_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -509,10 +606,10 @@ public static FileBasedArgument getBindPasswordFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getAddBaseEntry() throws ArgumentException { - final BooleanArgument addBaseEntryArg = new BooleanArgument("addBaseEntry".toLowerCase(), 'a', "addBaseEntry", - INFO_ARGUMENT_DESCRIPTION_ADDBASE.get()); - addBaseEntryArg.setPropertyName("addBaseEntry"); - return addBaseEntryArg; + return BooleanArgument.builder("addBaseEntry") + .shortIdentifier('a') + .description(INFO_ARGUMENT_DESCRIPTION_ADDBASE.get()) + .buildArgument(); } /** @@ -524,8 +621,11 @@ public static BooleanArgument getAddBaseEntry() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getRejectedImportLdif() throws ArgumentException { - return new StringArgument("rejectFile".toLowerCase(), 'R', "rejectFile", false, false, true, - INFO_REJECT_FILE_PLACEHOLDER.get(), null, "rejectFile", INFO_GENERAL_DESCRIPTION_REJECTED_FILE.get()); + return StringArgument.builder("rejectFile") + .shortIdentifier('R') + .description(INFO_GENERAL_DESCRIPTION_REJECTED_FILE.get()) + .valuePlaceholder(INFO_REJECT_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -537,10 +637,10 @@ public static StringArgument getRejectedImportLdif() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getRemote() throws ArgumentException { - final BooleanArgument remote = new BooleanArgument(OPTION_LONG_REMOTE.toLowerCase(), OPTION_SHORT_REMOTE, - OPTION_LONG_REMOTE, INFO_DESCRIPTION_REMOTE.get()); - remote.setPropertyName(OPTION_LONG_REMOTE); - return remote; + return BooleanArgument.builder(OPTION_LONG_REMOTE) + .shortIdentifier(OPTION_SHORT_REMOTE) + .description(INFO_DESCRIPTION_REMOTE.get()) + .buildArgument(); } /** @@ -551,10 +651,10 @@ public static BooleanArgument getRemote() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getReportAuthzId() throws ArgumentException { - final BooleanArgument report = new BooleanArgument(OPTION_LONG_REPORT_AUTHZ_ID.toLowerCase(), 'E', - OPTION_LONG_REPORT_AUTHZ_ID, INFO_DESCRIPTION_REPORT_AUTHZID.get()); - report.setPropertyName("reportAuthzID"); - return report; + return BooleanArgument.builder(OPTION_LONG_REPORT_AUTHZ_ID) + .shortIdentifier('E') + .description(INFO_DESCRIPTION_REPORT_AUTHZID.get()) + .buildArgument(); } /** @@ -566,10 +666,10 @@ public static BooleanArgument getReportAuthzId() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getRestart() throws ArgumentException { - final BooleanArgument restart = new BooleanArgument(OPTION_LONG_RESTART.toLowerCase(), 'R', - OPTION_LONG_RESTART, INFO_DESCRIPTION_RESTART.get()); - restart.setPropertyName(OPTION_LONG_RESTART); - return restart; + return BooleanArgument.builder(OPTION_LONG_RESTART) + .shortIdentifier('R') + .description(INFO_DESCRIPTION_RESTART.get()) + .buildArgument(); } /** @@ -580,8 +680,10 @@ public static BooleanArgument getRestart() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getSkippedImportFile() throws ArgumentException { - return new StringArgument("skipFile".toLowerCase(), null, "skipFile", false, false, true, - INFO_SKIP_FILE_PLACEHOLDER.get(), null, "skipFile", INFO_GENERAL_DESCRIPTION_SKIPPED_FILE.get()); + return StringArgument.builder("skipFile") + .description(INFO_GENERAL_DESCRIPTION_SKIPPED_FILE.get()) + .valuePlaceholder(INFO_SKIP_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -593,9 +695,13 @@ public static StringArgument getSkippedImportFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getSampleData() throws ArgumentException { - return new IntegerArgument("sampleData".toLowerCase(), 'd', "sampleData", false, false, true, - INFO_NUM_ENTRIES_PLACEHOLDER.get(), 0, "sampleData", true, 0, false, 0, - INFO_SETUP_DESCRIPTION_SAMPLE_DATA.get()); + return IntegerArgument.builder("sampleData") + .shortIdentifier('d') + .description(INFO_SETUP_DESCRIPTION_SAMPLE_DATA.get()) + .lowerBound(0) + .defaultValue(0) + .valuePlaceholder(INFO_NUM_ENTRIES_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -607,9 +713,12 @@ public static IntegerArgument getSampleData() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getSASL() throws ArgumentException { - return new StringArgument("sasloption", OPTION_SHORT_SASLOPTION, OPTION_LONG_SASLOPTION, false, true, true, - INFO_SASL_OPTION_PLACEHOLDER.get(), null, OPTION_LONG_SASLOPTION, - INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS.get()); + return StringArgument.builder(OPTION_LONG_SASLOPTION) + .shortIdentifier(OPTION_SHORT_SASLOPTION) + .description(INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS.get()) + .multiValued() + .valuePlaceholder(INFO_SASL_OPTION_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -621,13 +730,13 @@ public static StringArgument getSASL() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static MultiChoiceArgument getSearchScope() throws ArgumentException { - final MultiChoiceArgument searchScope = new MultiChoiceArgument<>( - OPTION_LONG_SEARCHSCOPE, OPTION_SHORT_SEARCHSCOPE, OPTION_LONG_SEARCHSCOPE, false, true, - INFO_SEARCH_SCOPE_PLACEHOLDER.get(), SearchScope.values(), false, - INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE.get()); - searchScope.setPropertyName(OPTION_LONG_SEARCHSCOPE); - searchScope.setDefaultValue(SearchScope.WHOLE_SUBTREE); - return searchScope; + return MultiChoiceArgument.builder(OPTION_LONG_SEARCHSCOPE) + .shortIdentifier(OPTION_SHORT_SEARCHSCOPE) + .description(INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE.get()) + .allowedValues(SearchScope.values()) + .defaultValue(SearchScope.WHOLE_SUBTREE) + .valuePlaceholder(INFO_SEARCH_SCOPE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -639,10 +748,11 @@ public static MultiChoiceArgument getSearchScope() throws ArgumentE * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getServerRoot() throws ArgumentException { - final StringArgument serverRoot = new StringArgument("serverRoot", OPTION_SHORT_SERVER_ROOT, - OPTION_LONG_SERVER_ROOT, false, false, true, INFO_SERVER_ROOT_DIR_PLACEHOLDER.get(), null, null, null); - serverRoot.setHidden(true); - return serverRoot; + return StringArgument.builder(OPTION_LONG_SERVER_ROOT) + .shortIdentifier(OPTION_SHORT_SERVER_ROOT) + .hidden() + .valuePlaceholder(INFO_SERVER_ROOT_DIR_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -654,8 +764,10 @@ public static StringArgument getServerRoot() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getServiceState() throws ArgumentException { - return new BooleanArgument("servicestate", 's', "serviceState", - INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE.get()); + return BooleanArgument.builder("serviceState") + .shortIdentifier('s') + .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE.get()) + .buildArgument(); } /** @@ -667,10 +779,10 @@ public static BooleanArgument getServiceState() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getScriptFriendly() throws ArgumentException { - final BooleanArgument sf = new BooleanArgument("script-friendly", OPTION_SHORT_SCRIPT_FRIENDLY, - OPTION_LONG_SCRIPT_FRIENDLY, INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()); - sf.setPropertyName(OPTION_LONG_SCRIPT_FRIENDLY); - return sf; + return BooleanArgument.builder(OPTION_LONG_SCRIPT_FRIENDLY) + .shortIdentifier(OPTION_SHORT_SCRIPT_FRIENDLY) + .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) + .buildArgument(); } /** @@ -683,9 +795,13 @@ public static BooleanArgument getScriptFriendly() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getLDAPPort(final int defaultLdapPort) throws ArgumentException { - return new IntegerArgument("ldapPort".toLowerCase(), OPTION_SHORT_PORT, "ldapPort", false, false, true, - INFO_PORT_PLACEHOLDER.get(), defaultLdapPort, "ldapPort", true, 1, true, 65535, - INFO_ARGUMENT_DESCRIPTION_LDAPPORT.get()); + return IntegerArgument.builder("ldapPort") + .shortIdentifier(OPTION_SHORT_PORT) + .description(INFO_ARGUMENT_DESCRIPTION_LDAPPORT.get()) + .range(1, 65535) + .defaultValue(defaultLdapPort) + .valuePlaceholder(INFO_PORT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -698,9 +814,12 @@ public static IntegerArgument getLDAPPort(final int defaultLdapPort) throws Argu * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getAdminLDAPPort(final int defaultAdminPort) throws ArgumentException { - return new IntegerArgument("adminConnectorPort".toLowerCase(), null, "adminConnectorPort", false, false, true, - INFO_PORT_PLACEHOLDER.get(), defaultAdminPort, "adminConnectorPort", true, 1, true, 65535, - INFO_ARGUMENT_DESCRIPTION_ADMINCONNECTORPORT.get()); + return IntegerArgument.builder("adminConnectorPort") + .description(INFO_ARGUMENT_DESCRIPTION_ADMINCONNECTORPORT.get()) + .range(1, 65535) + .defaultValue(defaultAdminPort) + .valuePlaceholder(INFO_PORT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -711,10 +830,9 @@ public static IntegerArgument getAdminLDAPPort(final int defaultAdminPort) throw * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getAdvancedMode() throws ArgumentException { - final BooleanArgument advanced = new BooleanArgument(OPTION_LONG_ADVANCED, null, OPTION_LONG_ADVANCED, - INFO_DESCRIPTION_ADVANCED.get()); - advanced.setPropertyName(OPTION_LONG_ADVANCED); - return advanced; + return BooleanArgument.builder(OPTION_LONG_ADVANCED) + .description(INFO_DESCRIPTION_ADVANCED.get()) + .buildArgument(); } /** @@ -725,9 +843,10 @@ public static BooleanArgument getAdvancedMode() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getAssertionFilter() throws ArgumentException { - return new StringArgument("assertionfilter", null, OPTION_LONG_ASSERTION_FILE, false, false, true, - INFO_ASSERTION_FILTER_PLACEHOLDER.get(), null, OPTION_LONG_ASSERTION_FILE, - INFO_DESCRIPTION_ASSERTION_FILTER.get()); + return StringArgument.builder(OPTION_LONG_ASSERTION_FILE) + .description(INFO_DESCRIPTION_ASSERTION_FILTER.get()) + .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -740,9 +859,13 @@ public static StringArgument getAssertionFilter() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getJMXPort(final int defaultJMXPort) throws ArgumentException { - return new IntegerArgument("jmxPort".toLowerCase(), 'x', "jmxPort", false, false, true, - INFO_JMXPORT_PLACEHOLDER.get(), defaultJMXPort, "jmxPort", true, 1, true, 65535, - INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()); + return IntegerArgument.builder("jmxPort") + .shortIdentifier('x') + .description(INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()) + .range(1, 65535) + .defaultValue(defaultJMXPort) + .valuePlaceholder(INFO_JMXPORT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -753,10 +876,10 @@ public static IntegerArgument getJMXPort(final int defaultJMXPort) throws Argume * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getSkipPortCheck() throws ArgumentException { - final BooleanArgument skipPortCheck = new BooleanArgument("skipPortCheck".toLowerCase(), 'S', "skipPortCheck", - INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()); - skipPortCheck.setPropertyName("skipPortCheck"); - return skipPortCheck; + return BooleanArgument.builder("skipPortCheck") + .shortIdentifier('S') + .description(INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()) + .buildArgument(); } /** @@ -767,10 +890,10 @@ public static BooleanArgument getSkipPortCheck() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getStartTLS() throws ArgumentException { - final BooleanArgument useStartTLS = new BooleanArgument("startTLS", OPTION_SHORT_START_TLS, - OPTION_LONG_START_TLS, INFO_DESCRIPTION_START_TLS.get()); - useStartTLS.setPropertyName(OPTION_LONG_START_TLS); - return useStartTLS; + return BooleanArgument.builder(OPTION_LONG_START_TLS) + .shortIdentifier(OPTION_SHORT_START_TLS) + .description(INFO_DESCRIPTION_START_TLS.get()) + .buildArgument(); } /** @@ -782,8 +905,11 @@ public static BooleanArgument getStartTLS() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getStopReason() throws ArgumentException { - return new StringArgument("stopreason", 'r', "stopReason", false, false, true, - INFO_STOP_REASON_PLACEHOLDER.get(), null, "stopReason", INFO_DESCRIPTION_STOP_REASON.get()); + return StringArgument.builder("stopReason") + .shortIdentifier('r') + .description(INFO_DESCRIPTION_STOP_REASON.get()) + .valuePlaceholder(INFO_STOP_REASON_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -795,8 +921,11 @@ public static StringArgument getStopReason() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getStopTime() throws ArgumentException { - return new StringArgument("stoptime", 't', "stopTime", false, false, true, INFO_STOP_TIME_PLACEHOLDER.get(), - null, "stopTime", INFO_DESCRIPTION_STOP_TIME.get()); + return StringArgument.builder("stopTime") + .shortIdentifier('t') + .description(INFO_DESCRIPTION_STOP_TIME.get()) + .valuePlaceholder(INFO_STOP_TIME_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -808,9 +937,12 @@ public static StringArgument getStopTime() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getRootDN() throws ArgumentException { - return new StringArgument(OPTION_LONG_ROOT_USER_DN.toLowerCase(), OPTION_SHORT_ROOT_USER_DN, - OPTION_LONG_ROOT_USER_DN, false, false, true, INFO_ROOT_USER_DN_PLACEHOLDER.get(), - "cn=Directory Manager", OPTION_LONG_ROOT_USER_DN, INFO_ARGUMENT_DESCRIPTION_ROOTDN.get()); + return StringArgument.builder(OPTION_LONG_ROOT_USER_DN) + .shortIdentifier(OPTION_SHORT_ROOT_USER_DN) + .description(INFO_ARGUMENT_DESCRIPTION_ROOTDN.get()) + .defaultValue("cn=Directory Manager") + .valuePlaceholder(INFO_ROOT_USER_DN_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -821,9 +953,11 @@ public static StringArgument getRootDN() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getRootDNPwd() throws ArgumentException { - return new StringArgument("rootUserPassword".toLowerCase(), OPTION_SHORT_BINDPWD, "rootUserPassword", false, - false, true, INFO_ROOT_USER_PWD_PLACEHOLDER.get(), null, "rootUserPassword", - INFO_ROOT_USER_PWD_PLACEHOLDER.get()); + return StringArgument.builder("rootUserPassword") + .shortIdentifier(OPTION_SHORT_BINDPWD) + .description(INFO_ROOT_USER_PWD_PLACEHOLDER.get()) + .valuePlaceholder(INFO_ROOT_USER_PWD_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -834,9 +968,11 @@ public static StringArgument getRootDNPwd() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static FileBasedArgument getRootDNPwdFile() throws ArgumentException { - return new FileBasedArgument("rootUserPasswordFile".toLowerCase(), OPTION_SHORT_BINDPWD_FILE, - "rootUserPasswordFile", false, false, INFO_ROOT_USER_PWD_FILE_PLACEHOLDER.get(), null, - "rootUserPasswordFile", INFO_ARGUMENT_DESCRIPTION_ROOTPWFILE.get()); + return FileBasedArgument.builder("rootUserPasswordFile") + .shortIdentifier(OPTION_SHORT_BINDPWD_FILE) + .description(INFO_ARGUMENT_DESCRIPTION_ROOTPWFILE.get()) + .valuePlaceholder(INFO_ROOT_USER_PWD_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -847,10 +983,10 @@ public static FileBasedArgument getRootDNPwdFile() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getEnableWindowsService() throws ArgumentException { - final BooleanArgument enableWindowsServiceArg = new BooleanArgument("enableWindowsService".toLowerCase(), 'e', - "enableWindowsService", INFO_ARGUMENT_DESCRIPTION_ENABLE_WINDOWS_SERVICE.get()); - enableWindowsServiceArg.setPropertyName("enableWindowsService"); - return enableWindowsServiceArg; + return BooleanArgument.builder("enableWindowsService") + .shortIdentifier('e') + .description(INFO_ARGUMENT_DESCRIPTION_ENABLE_WINDOWS_SERVICE.get()) + .buildArgument(); } /** @@ -862,8 +998,11 @@ public static BooleanArgument getEnableWindowsService() throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getEncoding() throws ArgumentException { - return new StringArgument("encoding", 'i', "encoding", false, false, true, INFO_ENCODING_PLACEHOLDER.get(), - null, "encoding", INFO_DESCRIPTION_ENCODING.get()); + return StringArgument.builder("encoding") + .shortIdentifier('i') + .description(INFO_DESCRIPTION_ENCODING.get()) + .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -874,10 +1013,10 @@ public static StringArgument getEncoding() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getDoNotStart() throws ArgumentException { - final BooleanArgument doNotStartArg = new BooleanArgument("doNotStart".toLowerCase(), 'O', "doNotStart", - INFO_SETUP_DESCRIPTION_DO_NOT_START.get()); - doNotStartArg.setPropertyName("doNotStart"); - return doNotStartArg; + return BooleanArgument.builder("doNotStart") + .shortIdentifier('O') + .description(INFO_SETUP_DESCRIPTION_DO_NOT_START.get()) + .buildArgument(); } /** @@ -889,8 +1028,10 @@ public static BooleanArgument getDoNotStart() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getDisableService() throws ArgumentException { - return new BooleanArgument("disableservice", 'd', "disableService", - INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_DISABLE.get()); + return BooleanArgument.builder("disableService") + .shortIdentifier('d') + .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_DISABLE.get()) + .buildArgument(); } /** @@ -901,8 +1042,9 @@ public static BooleanArgument getDisableService() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getDisplayEquivalentCommand() throws ArgumentException { - return new BooleanArgument(OPTION_LONG_DISPLAY_EQUIVALENT, null, OPTION_LONG_DISPLAY_EQUIVALENT, - INFO_DESCRIPTION_DISPLAY_EQUIVALENT.get()); + return BooleanArgument.builder(OPTION_LONG_DISPLAY_EQUIVALENT) + .description(INFO_DESCRIPTION_DISPLAY_EQUIVALENT.get()) + .buildArgument(); } /** @@ -916,9 +1058,10 @@ public static BooleanArgument getDisplayEquivalentCommand() throws ArgumentExcep */ public static StringArgument getEquivalentCommandFile(final LocalizableMessage description) throws ArgumentException { - return new StringArgument(OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, null, - OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, false, false, true, INFO_PATH_PLACEHOLDER.get(), null, null, - description); + return StringArgument.builder(OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH) + .description(description) + .valuePlaceholder(INFO_PATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -931,8 +1074,11 @@ public static StringArgument getEquivalentCommandFile(final LocalizableMessage d * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getFilename(final LocalizableMessage description) throws ArgumentException { - return new StringArgument("filename", OPTION_SHORT_FILENAME, OPTION_LONG_FILENAME, false, false, true, - INFO_FILE_PLACEHOLDER.get(), null, OPTION_LONG_FILENAME, description); + return StringArgument.builder(OPTION_LONG_FILENAME) + .shortIdentifier(OPTION_SHORT_FILENAME) + .description(description) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -943,10 +1089,10 @@ public static StringArgument getFilename(final LocalizableMessage description) t * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getEnableTLS() throws ArgumentException { - final BooleanArgument enableStartTLS = new BooleanArgument("enableStartTLS".toLowerCase(), - OPTION_SHORT_START_TLS, "enableStartTLS", INFO_SETUP_DESCRIPTION_ENABLE_STARTTLS.get()); - enableStartTLS.setPropertyName("enableStartTLS"); - return enableStartTLS; + return BooleanArgument.builder("enableStartTLS") + .shortIdentifier(OPTION_SHORT_START_TLS) + .description(INFO_SETUP_DESCRIPTION_ENABLE_STARTTLS.get()) + .buildArgument(); } /** @@ -960,9 +1106,13 @@ public static BooleanArgument getEnableTLS() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static IntegerArgument getLDAPSPort(final int defaultSecurePort) throws ArgumentException { - return new IntegerArgument("ldapsPort".toLowerCase(), OPTION_SHORT_USE_SSL, "ldapsPort", false, false, true, - INFO_PORT_PLACEHOLDER.get(), defaultSecurePort, "ldapsPort", true, 1, true, 65535, - INFO_ARGUMENT_DESCRIPTION_LDAPSPORT.get()); + return IntegerArgument.builder("ldapsPort") + .shortIdentifier(OPTION_SHORT_USE_SSL) + .description(INFO_ARGUMENT_DESCRIPTION_LDAPSPORT.get()) + .range(1, 65535) + .defaultValue(defaultSecurePort) + .valuePlaceholder(INFO_PORT_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -975,8 +1125,12 @@ public static IntegerArgument getLDAPSPort(final int defaultSecurePort) throws A * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getLDIFFile(final LocalizableMessage description) throws ArgumentException { - return new StringArgument(OPTION_LONG_LDIF_FILE.toLowerCase(), OPTION_SHORT_LDIF_FILE, OPTION_LONG_LDIF_FILE, - false, true, true, INFO_LDIFFILE_PLACEHOLDER.get(), null, null, description); + return StringArgument.builder(OPTION_LONG_LDIF_FILE) + .shortIdentifier(OPTION_SHORT_LDIF_FILE) + .description(description) + .multiValued() + .valuePlaceholder(INFO_LDIFFILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -987,10 +1141,9 @@ public static StringArgument getLDIFFile(final LocalizableMessage description) t * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getGenerateSelfSigned() throws ArgumentException { - final BooleanArgument generateSelfSigned = new BooleanArgument("generateSelfSignedCertificate".toLowerCase(), - null, "generateSelfSignedCertificate", INFO_ARGUMENT_DESCRIPTION_USE_SELF_SIGNED_CERTIFICATE.get()); - generateSelfSigned.setPropertyName("generateSelfSignedCertificate"); - return generateSelfSigned; + return BooleanArgument.builder("generateSelfSignedCertificate") + .description(INFO_ARGUMENT_DESCRIPTION_USE_SELF_SIGNED_CERTIFICATE.get()) + .buildArgument(); } /** @@ -1019,9 +1172,12 @@ public static StringArgument getHostName(final String defaultHostName) throws Ar */ public static StringArgument getHostName(final String defaultHostName, final LocalizableMessage description) throws ArgumentException { - return new StringArgument(OPTION_LONG_HOST.toLowerCase(), OPTION_SHORT_HOST, OPTION_LONG_HOST, false, false, - true, INFO_HOST_PLACEHOLDER.get(), defaultHostName, OPTION_LONG_HOST, description != null ? description - : INFO_ARGUMENT_DESCRIPTION_HOST_NAME.get()); + return StringArgument.builder(OPTION_LONG_HOST) + .shortIdentifier(OPTION_SHORT_HOST) + .description(description != null ? description : INFO_ARGUMENT_DESCRIPTION_HOST_NAME.get()) + .defaultValue(defaultHostName) + .valuePlaceholder(INFO_HOST_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1032,10 +1188,9 @@ public static StringArgument getHostName(final String defaultHostName, final Loc * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getUsePKCS11Keystore() throws ArgumentException { - final BooleanArgument usePkcs11 = new BooleanArgument("usePkcs11Keystore".toLowerCase(), null, - "usePkcs11Keystore", INFO_ARGUMENT_DESCRIPTION_USE_PKCS11.get()); - usePkcs11.setPropertyName("usePkcs11Keystore"); - return usePkcs11; + return BooleanArgument.builder("usePkcs11Keystore") + .description(INFO_ARGUMENT_DESCRIPTION_USE_PKCS11.get()) + .buildArgument(); } /** @@ -1046,9 +1201,10 @@ public static BooleanArgument getUsePKCS11Keystore() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getUseJavaKeyStore() throws ArgumentException { - return new StringArgument("useJavaKeystore".toLowerCase(), null, "useJavaKeystore", false, false, true, - INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, "useJavaKeystore", - INFO_ARGUMENT_DESCRIPTION_USE_JAVAKEYSTORE.get()); + return StringArgument.builder("useJavaKeystore") + .description(INFO_ARGUMENT_DESCRIPTION_USE_JAVAKEYSTORE.get()) + .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1059,8 +1215,10 @@ public static StringArgument getUseJavaKeyStore() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getUseJCEKS() throws ArgumentException { - return new StringArgument("useJCEKS".toLowerCase(), null, "useJCEKS", false, false, true, - INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, "useJCEKS", INFO_ARGUMENT_DESCRIPTION_USE_JCEKS.get()); + return StringArgument.builder("useJCEKS") + .description(INFO_ARGUMENT_DESCRIPTION_USE_JCEKS.get()) + .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1071,9 +1229,10 @@ public static StringArgument getUseJCEKS() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getUsePKCS12KeyStore() throws ArgumentException { - return new StringArgument("usePkcs12keyStore".toLowerCase(), null, "usePkcs12keyStore", false, false, true, - INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, "usePkcs12keyStore", - INFO_ARGUMENT_DESCRIPTION_USE_PKCS12.get()); + return StringArgument.builder("usePkcs12keyStore") + .description(INFO_ARGUMENT_DESCRIPTION_USE_PKCS12.get()) + .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1085,10 +1244,10 @@ public static StringArgument getUsePKCS12KeyStore() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static BooleanArgument getUseSSL() throws ArgumentException { - final BooleanArgument useSSL = new BooleanArgument("useSSL", OPTION_SHORT_USE_SSL, OPTION_LONG_USE_SSL, - INFO_DESCRIPTION_USE_SSL.get()); - useSSL.setPropertyName(OPTION_LONG_USE_SSL); - return useSSL; + return BooleanArgument.builder(OPTION_LONG_USE_SSL) + .shortIdentifier(OPTION_SHORT_USE_SSL) + .description(INFO_DESCRIPTION_USE_SSL.get()) + .buildArgument(); } /** @@ -1099,8 +1258,11 @@ public static BooleanArgument getUseSSL() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getKeyManagerPath() throws ArgumentException { - return new StringArgument("keymanagerpath", 'm', "keyManagerPath", false, false, true, - INFO_KEY_MANAGER_PATH_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_KEYMANAGER_PATH.get()); + return StringArgument.builder("keyManagerPath") + .shortIdentifier('m') + .description(INFO_DESCRIPTION_KEYMANAGER_PATH.get()) + .valuePlaceholder(INFO_KEY_MANAGER_PATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1111,9 +1273,11 @@ public static StringArgument getKeyManagerPath() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getKeyManagerProviderDN() throws ArgumentException { - return new StringArgument("keymanagerproviderdn", 'k', "keyManagerProviderDN", false, false, true, - INFO_KEY_MANAGER_PROVIDER_DN_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_KEYMANAGER_PROVIDER_DN.get()); + return StringArgument.builder("keyManagerProviderDN") + .shortIdentifier('k') + .description(INFO_DESCRIPTION_KEYMANAGER_PROVIDER_DN.get()) + .valuePlaceholder(INFO_KEY_MANAGER_PROVIDER_DN_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1124,9 +1288,11 @@ public static StringArgument getKeyManagerProviderDN() throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getKeyStorePassword() throws ArgumentException { - return new StringArgument(OPTION_LONG_KEYSTORE_PWD.toLowerCase(), OPTION_SHORT_KEYSTORE_PWD, - OPTION_LONG_KEYSTORE_PWD, false, false, true, INFO_KEYSTORE_PWD_PLACEHOLDER.get(), null, - OPTION_LONG_KEYSTORE_PWD, INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD.get()); + return StringArgument.builder(OPTION_LONG_KEYSTORE_PWD) + .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD) + .description(INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD.get()) + .valuePlaceholder(INFO_KEYSTORE_PWD_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1137,9 +1303,11 @@ public static StringArgument getKeyStorePassword() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static FileBasedArgument getKeyStorePasswordFile() throws ArgumentException { - return new FileBasedArgument(OPTION_LONG_KEYSTORE_PWD_FILE.toLowerCase(), OPTION_SHORT_KEYSTORE_PWD_FILE, - OPTION_LONG_KEYSTORE_PWD_FILE, false, false, INFO_KEYSTORE_PWD_FILE_PLACEHOLDER.get(), null, - OPTION_LONG_KEYSTORE_PWD_FILE, INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD_FILE.get()); + return FileBasedArgument.builder(OPTION_LONG_KEYSTORE_PWD_FILE) + .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD_FILE) + .description(INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD_FILE.get()) + .valuePlaceholder(INFO_KEYSTORE_PWD_FILE_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1150,11 +1318,11 @@ public static FileBasedArgument getKeyStorePasswordFile() throws ArgumentExcepti * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getKeyStorePath() throws ArgumentException { - final StringArgument ksPath = new StringArgument("keyStorePath", OPTION_SHORT_KEYSTOREPATH, - OPTION_LONG_KEYSTOREPATH, false, false, true, INFO_KEYSTOREPATH_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_KEYSTOREPATH.get()); - ksPath.setPropertyName(OPTION_LONG_KEYSTOREPATH); - return ksPath; + return StringArgument.builder(OPTION_LONG_KEYSTOREPATH) + .shortIdentifier(OPTION_SHORT_KEYSTOREPATH) + .description(INFO_DESCRIPTION_KEYSTOREPATH.get()) + .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) + .buildArgument(); } /** @@ -1165,8 +1333,50 @@ public static StringArgument getKeyStorePath() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument getCertNickName() throws ArgumentException { - return new StringArgument(OPTION_LONG_CERT_NICKNAME.toLowerCase(), OPTION_SHORT_CERT_NICKNAME, - OPTION_LONG_CERT_NICKNAME, false, true, true, INFO_NICKNAME_PLACEHOLDER.get(), null, - OPTION_LONG_CERT_NICKNAME, INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME.get()); + return StringArgument.builder(OPTION_LONG_CERT_NICKNAME) + .shortIdentifier(OPTION_SHORT_CERT_NICKNAME) + .description(INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME.get()) + .multiValued() + .valuePlaceholder(INFO_NICKNAME_PLACEHOLDER.get()) + .buildArgument(); + } + + /** + * Returns the "admin uid" string argument with the provided description. + * + * @param description + * The argument localizable description. + * @return The "admin uid" string argument with the provided description. + * @throws ArgumentException + * If there is a problem with any of the parameters used to create this argument. + */ + public static StringArgument getAdminUid(final LocalizableMessage description) throws ArgumentException { + return getAdminUid(false, description); + } + + /** + * Returns the "admin uid" hidden string argument. + * + * @param description + * The argument localizable description. + * @return The "admin uid" hidden string argument. + * @throws ArgumentException + * If there is a problem with any of the parameters used to create this argument. + */ + public static StringArgument getAdminUidHidden(final LocalizableMessage description) throws ArgumentException { + return getAdminUid(true, description); + } + + private static StringArgument getAdminUid(final boolean hidden, final LocalizableMessage description) + throws ArgumentException { + final StringArgument.Builder builder = StringArgument.builder(OPTION_LONG_ADMIN_UID) + .shortIdentifier('I') + .description(description) + .defaultValue(CliConstants.GLOBAL_ADMIN_UID) + .valuePlaceholder(INFO_ADMINUID_PLACEHOLDER.get()); + if (hidden) { + builder.hidden(); + } + return builder.buildArgument(); } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index d3d4f9625..4b8ba91d0 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -252,14 +252,13 @@ public ConnectionFactoryProvider(final ArgumentParser argumentParser, reportAuthzIDArg = CommonArguments.getReportAuthzId(); argumentParser.addArgument(reportAuthzIDArg); - connectTimeOut = CommonArguments.getConnectTimeOut(); + connectTimeOut = CommonArguments.getConnectTimeOutHidden(); argumentParser.addArgument(connectTimeOut); usePasswordPolicyControlArg = - new BooleanArgument("usepwpolicycontrol", null, OPTION_LONG_USE_PW_POLICY_CTL, - INFO_DESCRIPTION_USE_PWP_CONTROL.get()); - usePasswordPolicyControlArg.setPropertyName(OPTION_LONG_USE_PW_POLICY_CTL); - argumentParser.addArgument(usePasswordPolicyControlArg); + BooleanArgument.builder(OPTION_LONG_USE_PW_POLICY_CTL) + .description(INFO_DESCRIPTION_USE_PWP_CONTROL.get()) + .buildAndAddToParser(argumentParser); } /** diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java index 9285b505c..71486f512 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java @@ -39,12 +39,4 @@ public interface DocDescriptionSupplement { * or LocalizableMessage.EMPTY if there is no supplement. */ LocalizableMessage getDocDescriptionSupplement(); - - /** - * Sets a supplement to the description intended for use in generated reference documentation. - * - * @param docDescriptionSupplement The supplement to the description - * for use in generated reference documentation. - */ - void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement); } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java index 6ac905cae..42ad6c4b7 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java @@ -37,7 +37,6 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; /** @@ -56,85 +55,41 @@ * multiple lines, then only the first line will be read. */ public final class FileBasedArgument extends Argument { - /** The mapping between filenames specified and the first lines read from those files. */ - private final Map namesToValues = new LinkedHashMap<>(); /** - * Creates a new file-based argument with the provided information. + * Returns a builder which can be used for incrementally constructing a new + * {@link FileBasedArgument}. * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. + * The generic long identifier that will be used to refer to this argument. + * @return A builder to continue building the {@link FileBasedArgument}. */ - public FileBasedArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final LocalizableMessage valuePlaceholder, final String defaultValue, - final String propertyName, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, isMultiValued, true, - valuePlaceholder, defaultValue, propertyName, description); + public static Builder builder(final String longIdentifier) { + return new Builder(longIdentifier); } - /** - * Creates a new file-based argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public FileBasedArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, - final LocalizableMessage valuePlaceholder, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, false, true, valuePlaceholder, - null, null, description); + /** A fluent API for incrementally constructing {@link FileBasedArgument}. */ + public static final class Builder extends ArgumentBuilder { + private Builder(final String longIdentifier) { + super(longIdentifier); + } + + @Override + Builder getThis() { + return this; + } + + @Override + public FileBasedArgument buildArgument() throws ArgumentException { + return new FileBasedArgument(this); + } + } + + /** The mapping between filenames specified and the first lines read from those files. */ + private final Map namesToValues = new LinkedHashMap<>(); + + private FileBasedArgument(final Builder builder) throws ArgumentException { + super(builder); } /** @@ -188,12 +143,12 @@ public boolean valueIsAcceptable(final String valueString, try { valueFile = new File(valueString); if (!valueFile.exists()) { - invalidReason.append(ERR_FILEARG_NO_SUCH_FILE.get(valueString, getName())); + invalidReason.append(ERR_FILEARG_NO_SUCH_FILE.get(valueString, longIdentifier)); return false; } } catch (final Exception e) { - invalidReason.append(ERR_FILEARG_CANNOT_VERIFY_FILE_EXISTENCE.get(valueString, - getName(), getExceptionMessage(e))); + invalidReason.append(ERR_FILEARG_CANNOT_VERIFY_FILE_EXISTENCE.get( + valueString, longIdentifier, getExceptionMessage(e))); return false; } @@ -202,16 +157,16 @@ public boolean valueIsAcceptable(final String valueString, try (BufferedReader reader = new BufferedReader(new FileReader(valueFile))) { line = reader.readLine(); } catch (final FileNotFoundException e) { - invalidReason.append(ERR_FILEARG_CANNOT_OPEN_FILE.get(valueString, getName(), getExceptionMessage(e))); + invalidReason.append(ERR_FILEARG_CANNOT_OPEN_FILE.get(valueString, longIdentifier, getExceptionMessage(e))); return false; } catch (final IOException e) { - invalidReason.append(ERR_FILEARG_CANNOT_READ_FILE.get(valueString, getName(), getExceptionMessage(e))); + invalidReason.append(ERR_FILEARG_CANNOT_READ_FILE.get(valueString, longIdentifier, getExceptionMessage(e))); return false; } // If the line read is null, then that means the file was empty. if (line == null) { - invalidReason.append(ERR_FILEARG_EMPTY_FILE.get(valueString, getName())); + invalidReason.append(ERR_FILEARG_EMPTY_FILE.get(valueString, longIdentifier)); return false; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java index d832e7585..1e727fa55 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java @@ -36,243 +36,84 @@ * potentially only those in a given range. */ public final class IntegerArgument extends Argument { - /** Indicates whether a lower bound will be enforced for this argument. */ - private final boolean hasLowerBound; /** - * Indicates whether an upper bound will be enforced for this - * argument. - */ - private final boolean hasUpperBound; - - /** The lower bound that will be enforced for this argument. */ - private final int lowerBound; - - /** The upper bound that will be enforced for this argument. */ - private final int upperBound; - - /** - * Creates a new integer argument with the provided information. + * Returns a builder which can be used for incrementally constructing a new + * {@link IntegerArgument}. * * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param hasLowerBound - * Indicates whether a lower bound should be enforced for values - * of this argument. - * @param lowerBound - * The lower bound that should be enforced for values of this - * argument. - * @param hasUpperBound - * Indicates whether an upperbound should be enforced for values - * of this argument. - * @param upperBound - * The upper bound that should be enforced for values of this - * argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. + * The generic name that will be used to refer to this argument. + * @return A builder to continue building the {@link IntegerArgument}. */ - public IntegerArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final boolean needsValue, final LocalizableMessage valuePlaceholder, - final int defaultValue, final String propertyName, final boolean hasLowerBound, - final int lowerBound, final boolean hasUpperBound, final int upperBound, - final LocalizableMessage description) throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, isMultiValued, needsValue, - valuePlaceholder, String.valueOf(defaultValue), propertyName, description); + public static Builder builder(final String name) { + return new Builder(name); + } - this.hasLowerBound = hasLowerBound; - this.hasUpperBound = hasUpperBound; - this.lowerBound = lowerBound; - this.upperBound = upperBound; + /** A fluent API for incrementally constructing {@link IntegerArgument}. */ + public static final class Builder extends ArgumentBuilder { + private int lowerBound = Integer.MIN_VALUE; + private int upperBound = Integer.MAX_VALUE; - if (hasLowerBound && hasUpperBound && (lowerBound > upperBound)) { - final LocalizableMessage message = - ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND.get(name, lowerBound, upperBound); - throw new ArgumentException(message); + private Builder(final String name) { + super(name); } - } - /** - * Creates a new integer argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public IntegerArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final boolean needsValue, final LocalizableMessage valuePlaceholder, - final int defaultValue, final String propertyName, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, isMultiValued, needsValue, - valuePlaceholder, String.valueOf(defaultValue), propertyName, description); + @Override + Builder getThis() { + return this; + } - hasLowerBound = false; - hasUpperBound = false; - lowerBound = Integer.MIN_VALUE; - upperBound = Integer.MAX_VALUE; + /** + * Sets the lower bound of this {@link IntegerArgument}. + * + * @param lowerBound + * The lower bound value. + * @return This builder. + */ + public Builder lowerBound(final int lowerBound) { + this.lowerBound = lowerBound; + return getThis(); + } + + /** + * Sets the range of this {@link IntegerArgument}. + * + * @param lowerBound + * The range lower bound value. + * @param upperBound + * The range upper bound value. + * @return This builder. + */ + public Builder range(final int lowerBound, final int upperBound) { + this.lowerBound = lowerBound; + this.upperBound = upperBound; + return getThis(); + } + + @Override + public IntegerArgument buildArgument() throws ArgumentException { + return new IntegerArgument(this, lowerBound, upperBound); + } } - /** - * Creates a new integer argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param hasLowerBound - * Indicates whether a lower bound should be enforced for values - * of this argument. - * @param lowerBound - * The lower bound that should be enforced for values of this - * argument. - * @param hasUpperBound - * Indicates whether an upperbound should be enforced for values - * of this argument. - * @param upperBound - * The upper bound that should be enforced for values of this - * argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public IntegerArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean needsValue, - final LocalizableMessage valuePlaceholder, final boolean hasLowerBound, - final int lowerBound, final boolean hasUpperBound, final int upperBound, - final LocalizableMessage description) throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, false, needsValue, - valuePlaceholder, null, null, description); + /** The lower bound that will be enforced for this argument. */ + private final int lowerBound; + /** The upper bound that will be enforced for this argument. */ + private final int upperBound; - this.hasLowerBound = hasLowerBound; - this.hasUpperBound = hasUpperBound; + private IntegerArgument(final Builder builder, final int lowerBound, final int upperBound) + throws ArgumentException { + super(builder); this.lowerBound = lowerBound; this.upperBound = upperBound; - if (hasLowerBound && hasUpperBound && (lowerBound > upperBound)) { + if (lowerBound > upperBound) { final LocalizableMessage message = - ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND.get(name, lowerBound, upperBound); + ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND.get(builder.longIdentifier, lowerBound, upperBound); throw new ArgumentException(message); } } - /** - * Creates a new integer argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public IntegerArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean needsValue, - final LocalizableMessage valuePlaceholder, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, false, needsValue, - valuePlaceholder, null, null, description); - - hasLowerBound = false; - hasUpperBound = false; - lowerBound = Integer.MIN_VALUE; - upperBound = Integer.MAX_VALUE; - } - /** * Indicates whether the provided value is acceptable for use in this * argument. @@ -289,19 +130,19 @@ public IntegerArgument(final String name, final Character shortIdentifier, public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { try { final int intValue = Integer.parseInt(valueString); - if (hasLowerBound && intValue < lowerBound) { - invalidReason.append(ERR_INTARG_VALUE_BELOW_LOWER_BOUND.get(getPropertyName(), intValue, lowerBound)); + if (intValue < lowerBound) { + invalidReason.append(ERR_INTARG_VALUE_BELOW_LOWER_BOUND.get(longIdentifier, intValue, lowerBound)); return false; } - if (hasUpperBound && intValue > upperBound) { - invalidReason.append(ERR_INTARG_VALUE_ABOVE_UPPER_BOUND.get(getPropertyName(), intValue, upperBound)); + if (intValue > upperBound) { + invalidReason.append(ERR_INTARG_VALUE_ABOVE_UPPER_BOUND.get(longIdentifier, intValue, upperBound)); return false; } return true; } catch (final NumberFormatException e) { - invalidReason.append(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, getPropertyName())); + invalidReason.append(ERR_ARG_CANNOT_DECODE_AS_INT.get(valueString, longIdentifier)); return false; } } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java index 92b3b9e1d..05542efb1 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java @@ -28,130 +28,87 @@ import static com.forgerock.opendj.cli.CliMessages.ERR_MCARG_VALUE_NOT_ALLOWED; +import java.util.Arrays; import java.util.Collection; +import java.util.LinkedList; +import java.util.List; -import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; /** * This class defines an argument type that will only accept one or more of a * specific set of string values. * - * @param + * @param * The type of values returned by this argument. */ -public final class MultiChoiceArgument extends Argument { - /** - * Indicates whether argument values should be treated in a - * case-sensitive manner. - */ - private final boolean caseSensitive; - - /** The set of values that will be allowed for use with this argument. */ - private final Collection allowedValues; +public final class MultiChoiceArgument extends Argument { /** - * Creates a new string argument with the provided information. + * Returns a builder which can be used for incrementally constructing a new + * {@link MultiChoiceArgument}. * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. + * @param + * The type of values returned by this argument. * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param allowedValues - * The set of values that are allowed for use for this argument. - * If they are not to be treated in a case-sensitive value then - * they should all be formatted in lowercase. - * @param caseSensitive - * Indicates whether the set of allowed values should be treated - * in a case-sensitive manner. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. + * The generic long identifier that will be used to refer to this argument. + * @return A builder to continue building the {@link MultiChoiceArgument}. */ - public MultiChoiceArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final boolean needsValue, final LocalizableMessage valuePlaceholder, - final String defaultValue, final String propertyName, - final Collection allowedValues, final boolean caseSensitive, - final LocalizableMessage description) throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, isMultiValued, needsValue, - valuePlaceholder, defaultValue, propertyName, description); + public static Builder builder(final String longIdentifier) { + return new Builder<>(longIdentifier); + } - this.allowedValues = allowedValues; - this.caseSensitive = caseSensitive; + /** A fluent API for incrementally constructing {@link MultiChoiceArgument}. */ + public static final class Builder extends ArgumentBuilder, V, MultiChoiceArgument> { + private final List allowedValues = new LinkedList<>(); + + private Builder(final String longIdentifier) { + super(longIdentifier); + } + + @Override + Builder getThis() { + return this; + } + + /** + * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. + * + * @param allowedValues + * The {@link MultiChoiceArgument} allowed values. + * @return This builder. + */ + public Builder allowedValues(final Collection allowedValues) { + this.allowedValues.addAll(allowedValues); + return getThis(); + } + + /** + * Specifies the set of values that are allowed for the {@link MultiChoiceArgument}. + * + * @param allowedValues + * The {@link MultiChoiceArgument} allowed values. + * @return This builder. + */ + @SuppressWarnings("unchecked") + public final Builder allowedValues(final V... allowedValues) { + this.allowedValues.addAll(Arrays.asList(allowedValues)); + return getThis(); + } + + @Override + public MultiChoiceArgument buildArgument() throws ArgumentException { + return new MultiChoiceArgument<>(this, allowedValues); + } } - /** - * Creates a new string argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param allowedValues - * The set of values that are allowed for use for this argument. - * If they are not to be treated in a case-sensitive value then - * they should all be formatted in lowercase. - * @param caseSensitive - * Indicates whether the set of allowed values should be treated - * in a case-sensitive manner. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public MultiChoiceArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean needsValue, - final LocalizableMessage valuePlaceholder, final Collection allowedValues, - final boolean caseSensitive, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, false, needsValue, - valuePlaceholder, null, null, description); + /** The set of values that will be allowed for use with this argument. */ + private final Collection allowedValues; + private MultiChoiceArgument(final Builder builder, final Collection allowedValues) + throws ArgumentException { + super(builder); this.allowedValues = allowedValues; - this.caseSensitive = caseSensitive; } /** @@ -164,32 +121,17 @@ public MultiChoiceArgument(final String name, final Character shortIdentifier, * @throws ArgumentException * The value cannot be parsed. */ - public T getTypedValue() throws ArgumentException { + public V getTypedValue() throws ArgumentException { final String v = super.getValue(); if (v == null) { return null; } - for (final T o : allowedValues) { - if ((caseSensitive && o.toString().equals(v)) || o.toString().equalsIgnoreCase(v)) { - return o; + for (final V allowedValue : allowedValues) { + if (allowedValue.toString().equalsIgnoreCase(v)) { + return allowedValue; } } - // TODO: Some message - throw new ArgumentException(null); - } - - /** - * Specifies the default value that will be used for this argument if it is - * not specified on the command line and it is not set from a properties - * file. - * - * @param defaultValue - * The default value that will be used for this argument if it is - * not specified on the command line and it is not set from a - * properties file. - */ - public void setDefaultValue(final T defaultValue) { - super.setDefaultValue(defaultValue.toString()); + throw new IllegalStateException("This MultiChoiceArgument value is not part of the allowed values."); } /** @@ -205,15 +147,13 @@ public void setDefaultValue(final T defaultValue) { * false if it is not. */ @Override - public boolean valueIsAcceptable(final String valueString, - final LocalizableMessageBuilder invalidReason) { - for (final T o : allowedValues) { - if ((caseSensitive && o.toString().equals(valueString)) - || o.toString().equalsIgnoreCase(valueString)) { + public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { + for (final V allowedValue : allowedValues) { + if (allowedValue.toString().equalsIgnoreCase(valueString)) { return true; } } - invalidReason.append(ERR_MCARG_VALUE_NOT_ALLOWED.get(getName(), valueString)); + invalidReason.append(ERR_MCARG_VALUE_NOT_ALLOWED.get(longIdentifier, valueString)); return false; } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java index 70b52c4bc..48bd921aa 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java @@ -26,93 +26,42 @@ */ package com.forgerock.opendj.cli; -import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizableMessageBuilder; /** This class defines an argument type that will accept any string value. */ public final class StringArgument extends Argument { /** - * Creates a new string argument with the provided information. + * Returns a builder which can be used for incrementally constructing a new + * {@link StringArgument}. * * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param isMultiValued - * Indicates whether this argument may be specified more than - * once to provide multiple values. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param defaultValue - * The default value that should be used for this argument if - * none is provided in a properties file or on the command line. - * This may be null if there is no generic default. - * @param propertyName - * The name of the property in a property file that may be used - * to override the default value but will be overridden by a - * command-line argument. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. + * The generic name that will be used to refer to this argument. + * @return A builder to continue building the {@link StringArgument}. */ - public StringArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean isMultiValued, - final boolean needsValue, final LocalizableMessage valuePlaceholder, - final String defaultValue, final String propertyName, - final LocalizableMessage description) throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, isMultiValued, needsValue, - valuePlaceholder, defaultValue, propertyName, description); + public static Builder builder(final String name) { + return new Builder(name); } - /** - * Creates a new string argument with the provided information. - * - * @param name - * The generic name that should be used to refer to this - * argument. - * @param shortIdentifier - * The single-character identifier for this argument, or - * null if there is none. - * @param longIdentifier - * The long identifier for this argument, or null if - * there is none. - * @param isRequired - * Indicates whether this argument must be specified on the - * command line. - * @param needsValue - * Indicates whether this argument requires a value. - * @param valuePlaceholder - * The placeholder for the argument value that will be displayed - * in usage information, or null if this argument - * does not require a value. - * @param description - * LocalizableMessage for the description of this argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to - * create this argument. - */ - public StringArgument(final String name, final Character shortIdentifier, - final String longIdentifier, final boolean isRequired, final boolean needsValue, - final LocalizableMessage valuePlaceholder, final LocalizableMessage description) - throws ArgumentException { - super(name, shortIdentifier, longIdentifier, isRequired, false, needsValue, - valuePlaceholder, null, null, description); + /** A fluent API for incrementally constructing {@link StringArgument}. */ + public static final class Builder extends ArgumentBuilder { + private Builder(final String name) { + super(name); + } + + @Override + Builder getThis() { + return this; + } + + @Override + public StringArgument buildArgument() throws ArgumentException { + return new StringArgument(this); + } } + private StringArgument(final Builder builder) throws ArgumentException { + super(builder); + } @Override public boolean valueIsAcceptable(final String valueString, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java index 15c21f319..303863b46 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java @@ -168,7 +168,12 @@ public LocalizableMessage getDocDescriptionSupplement() { return docDescriptionSupplement != null ? docDescriptionSupplement : LocalizableMessage.EMPTY; } - @Override + /** + * Sets a supplement to the description intended for use in generated reference documentation. + * + * @param docDescriptionSupplement + * The supplement to the description for use in generated reference documentation. + */ public void setDocDescriptionSupplement(final LocalizableMessage docDescriptionSupplement) { this.docDescriptionSupplement = docDescriptionSupplement; } @@ -205,20 +210,15 @@ public Argument getArgument(String longID) { } /** - * Retrieves the subcommand argument with the specified name. + * Retrieves the subcommand argument with the specified long identifier. * - * @param name - * The name of the argument to retrieve. - * @return The subcommand argument with the specified name, or null if there is no such argument. + * @param longIdentifier + * The long identifier of the argument to retrieve. + * @return The subcommand argument with the specified long identifier, + * or null if there is no such argument. */ - public Argument getArgumentForName(String name) { - for (Argument a : arguments) { - if (a.getName().equals(name)) { - return a; - } - } - - return null; + public Argument getArgumentForLongIdentifier(final String longIdentifier) { + return longIDMap.get(parser.longArgumentsCaseSensitive() ? longIdentifier : toLowerCase(longIdentifier)); } /** @@ -231,53 +231,40 @@ public Argument getArgumentForName(String name) { * associated with this subcommand. */ public void addArgument(Argument argument) throws ArgumentException { - String argumentName = argument.getName(); - for (Argument a : arguments) { - if (argumentName.equals(a.getName())) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_DUPLICATE_ARGUMENT_NAME.get(name, argumentName); - throw new ArgumentException(message); - } + final String argumentLongID = argument.getLongIdentifier(); + if (getArgumentForLongIdentifier(argumentLongID) != null) { + throw new ArgumentException(ERR_ARG_SUBCOMMAND_DUPLICATE_ARGUMENT_NAME.get(name, argumentLongID)); } - if (parser.hasGlobalArgument(argumentName)) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_ARGUMENT_GLOBAL_CONFLICT.get(argumentName, name); - throw new ArgumentException(message); + if (parser.hasGlobalArgument(argumentLongID)) { + throw new ArgumentException(ERR_ARG_SUBCOMMAND_ARGUMENT_GLOBAL_CONFLICT.get(argumentLongID, name)); } Character shortID = argument.getShortIdentifier(); if (shortID != null) { if (shortIDMap.containsKey(shortID)) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_DUPLICATE_SHORT_ID.get(argumentName, name, - String.valueOf(shortID), shortIDMap.get(shortID).getName()); - throw new ArgumentException(message); + throw new ArgumentException(ERR_ARG_SUBCOMMAND_DUPLICATE_SHORT_ID.get( + argumentLongID, name, String.valueOf(shortID), shortIDMap.get(shortID).getLongIdentifier())); } Argument arg = parser.getGlobalArgumentForShortID(shortID); if (arg != null) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_ARGUMENT_SHORT_ID_GLOBAL_CONFLICT.get(argumentName, - name, String.valueOf(shortID), arg.getName()); - throw new ArgumentException(message); + throw new ArgumentException(ERR_ARG_SUBCOMMAND_ARGUMENT_SHORT_ID_GLOBAL_CONFLICT.get( + argumentLongID, name, String.valueOf(shortID), arg.getLongIdentifier())); } } String longID = argument.getLongIdentifier(); - if (longID != null) { - if (!parser.longArgumentsCaseSensitive()) { - longID = toLowerCase(longID); - } - + if (!parser.longArgumentsCaseSensitive()) { + longID = toLowerCase(longID); if (longIDMap.containsKey(longID)) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_DUPLICATE_LONG_ID.get(argumentName, name, - argument.getLongIdentifier(), longIDMap.get(longID).getName()); - throw new ArgumentException(message); + throw new ArgumentException(ERR_ARG_SUBCOMMAND_DUPLICATE_LONG_ID.get(argumentLongID, name)); } + } - Argument arg = parser.getGlobalArgumentForLongID(longID); - if (arg != null) { - LocalizableMessage message = ERR_ARG_SUBCOMMAND_ARGUMENT_LONG_ID_GLOBAL_CONFLICT.get(argumentName, - name, argument.getLongIdentifier(), arg.getName()); - throw new ArgumentException(message); - } + Argument arg = parser.getGlobalArgumentForLongID(longID); + if (arg != null) { + throw new ArgumentException(ERR_ARG_SUBCOMMAND_ARGUMENT_LONG_ID_GLOBAL_CONFLICT.get(argumentLongID, name)); } arguments.add(argument); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java index 2c0ef3342..f044761c0 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java @@ -207,58 +207,44 @@ public void addLdapConnectionArgument(final Argument argument) throws ArgumentEx * defined. */ public void addGlobalArgument(Argument argument, ArgumentGroup group) throws ArgumentException { - String argumentName = argument.getName(); - if (globalArgumentMap.containsKey(argumentName)) { - throw new ArgumentException(ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_NAME.get(argumentName)); + String longID = argument.getLongIdentifier(); + if (globalArgumentMap.containsKey(longID)) { + throw new ArgumentException(ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_NAME.get(longID)); } for (SubCommand s : subCommands.values()) { - if (s.getArgumentForName(argumentName) != null) { + if (s.getArgumentForLongIdentifier(longID) != null) { throw new ArgumentException(ERR_SUBCMDPARSER_GLOBAL_ARG_NAME_SUBCMD_CONFLICT.get( - argumentName, s.getName())); + longID, s.getName())); } } Character shortID = argument.getShortIdentifier(); if (shortID != null) { if (globalShortIDMap.containsKey(shortID)) { - String name = globalShortIDMap.get(shortID).getName(); - + String conflictingLongID = globalShortIDMap.get(shortID).getLongIdentifier(); throw new ArgumentException(ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_SHORT_ID.get( - shortID, argumentName, name)); + shortID, longID, conflictingLongID)); } for (SubCommand s : subCommands.values()) { if (s.getArgument(shortID) != null) { - String cmdName = s.getName(); - String name = s.getArgument(shortID).getName(); - + String conflictingLongID = s.getArgument(shortID).getLongIdentifier(); throw new ArgumentException(ERR_SUBCMDPARSER_GLOBAL_ARG_SHORT_ID_CONFLICT.get( - shortID, argumentName, name, cmdName)); + shortID, longID, conflictingLongID, s.getName())); } } } - String longID = argument.getLongIdentifier(); - if (longID != null) { - if (!longArgumentsCaseSensitive()) { - longID = toLowerCase(longID); - } - + if (!longArgumentsCaseSensitive()) { + longID = toLowerCase(longID); if (globalLongIDMap.containsKey(longID)) { - String name = globalLongIDMap.get(longID).getName(); - - throw new ArgumentException(ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID.get( - argument.getLongIdentifier(), argumentName, name)); + throw new ArgumentException(ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID.get(longID)); } + } - for (SubCommand s : subCommands.values()) { - if (s.getArgument(longID) != null) { - String cmdName = s.getName(); - String name = s.getArgument(longID).getName(); - - throw new ArgumentException(ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT.get( - argument.getLongIdentifier(), argumentName, name, cmdName)); - } + for (SubCommand s : subCommands.values()) { + if (s.getArgument(longID) != null) { + throw new ArgumentException(ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT.get(longID, s.getName())); } } @@ -1143,11 +1129,6 @@ private void setSubCommandOptionsInfo(Map map, SubCommand subCom if (a.isHidden()) { continue; } - // Return a generic FQDN for localhost as the default hostname - // in reference documentation. - if (isHostNameArgument(a)) { - a.setDefaultValue("localhost.localdomain"); - } Map option = new HashMap<>(); String optionSynopsis = getOptionSynopsis(a); @@ -1162,7 +1143,8 @@ private void setSubCommandOptionsInfo(Map map, SubCommand subCom // Let this build its own arbitrarily formatted additional info. info.put("usage", subCommandUsageHandler.getArgumentAdditionalInfo(subCommand, a, nameOption)); } else { - String defaultValue = a.getDefaultValue(); + // Return a generic FQDN for localhost as the default hostname in reference documentation. + final String defaultValue = isHostNameArgument(a) ? "localhost.localdomain" : a.getDefaultValue(); info.put("default", defaultValue != null ? REF_DEFAULT.get(defaultValue) : null); // If there is a supplement to the description for this argument, @@ -1239,4 +1221,9 @@ private void appendSubCommandReference(StringBuilder builder, map.put("subcommands", commands); applyTemplate(builder, "dscfgReference.ftl", map); } + + @Override + public void replaceArgument(final Argument argument) { + replaceArgumentInCollections(globalLongIDMap, globalShortIDMap, globalArgumentList, argument); + } } diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties index 956028e9b..4c2d7fb7b 100755 --- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties @@ -21,14 +21,11 @@ # CDDL HEADER END # # -# Copyright 2014-2015 ForgeRock AS. +# Copyright 2014-2016 ForgeRock AS. # # # CLI messages # -ERR_ARG_NO_IDENTIFIER=The %s argument does not have either a \ - single-character or a long identifier that may be used to specify it. At \ - least one of these must be specified for each argument ERR_ARG_NO_VALUE_PLACEHOLDER=The %s argument is configured to take \ a value but no value placeholder has been defined for it ERR_ARG_NO_INT_VALUE=The %s argument does not have any value that \ @@ -75,8 +72,7 @@ ERR_ARGPARSER_DUPLICATE_SHORT_ID=Cannot add argument %s to the \ argument list because its short identifier -%s conflicts with the %s argument \ that has already been defined ERR_ARGPARSER_DUPLICATE_LONG_ID=Cannot add argument %s to the \ - argument list because its long identifier --%s conflicts with the %s argument \ - that has already been defined + argument list because there is already one defined with the same identifier ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred while \ attempting to read the contents of the argument properties file %s: %s ERR_ARGPARSER_TOO_MANY_TRAILING_ARGS=The provided set of \ @@ -203,9 +199,6 @@ INFO_DESCRIPTION_STOP_REASON=Reason the server is being stopped or \ restarted INFO_CHECK_STOPPABILITY=Used to determine whether the server can \ be stopped or not and the mode to be used to stop it -INFO_DESCRIPTION_WINDOWS_NET_STOP=Used by the window service code \ - to inform that stop-ds is being called from the window services after a call \ - to net stop INFO_DESCRIPTION_STOP_TIME=Indicates the date/time at which the \ shutdown operation will begin as a server task expressed in format \ YYYYMMDDhhmmssZ for UTC time or YYYYMMDDhhmmss for local time. A value of \ @@ -663,11 +656,11 @@ ERR_ARG_SUBCOMMAND_DUPLICATE_SHORT_ID=Argument %s for subcommand %s \ ERR_ARG_SUBCOMMAND_ARGUMENT_SHORT_ID_GLOBAL_CONFLICT=Argument %s \ for subcommand %s has a short ID -%s that conflicts with that of global \ argument %s -ERR_ARG_SUBCOMMAND_DUPLICATE_LONG_ID=Argument %s for subcommand %s \ - has a long identifier --%s that conflicts with that of argument %s -ERR_ARG_SUBCOMMAND_ARGUMENT_LONG_ID_GLOBAL_CONFLICT=Argument %s for \ - subcommand %s has a long ID --%s that conflicts with that of global argument \ - %s +ERR_ARG_SUBCOMMAND_DUPLICATE_LONG_ID=Failed to add Argument %s for subcommand %s \ + because there is already an argument with the same identifier for this subcommand +ERR_ARG_SUBCOMMAND_ARGUMENT_LONG_ID_GLOBAL_CONFLICT=Failed to add Argument %s for \ + subcommand %s because there is already a global argument defined with the \ + same long identifier ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_NAME=There is already another \ global argument named "%s" ERR_SUBCMDPARSER_GLOBAL_ARG_NAME_SUBCMD_CONFLICT=The argument name \ @@ -678,11 +671,11 @@ ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_SHORT_ID=Short ID -%s for \ ERR_SUBCMDPARSER_GLOBAL_ARG_SHORT_ID_CONFLICT=Short ID -%s for \ global argument %s conflicts with the short ID for the %s argument associated \ with subcommand %s -ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID=Long ID --%s for \ - global argument %s conflicts with the long ID of another global argument %s -ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT=Long ID --%s for \ - global argument %s conflicts with the long ID for the %s argument associated \ - with subcommand %s +ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID=Failed to add global argument \ + %s because there is already one defined with the same long identifier +ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT=Failed to add argument %s to \ + subcommand %s because there is already one argument with the same long identifier \ + associated to this subcommand. ERR_SUBCMDPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred \ while attempting to read the contents of the argument properties file %s: %s ERR_SUBCMDPARSER_LONG_ARG_WITHOUT_NAME=The provided command-line \ diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java index c9d0b18cb..0592a8f00 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java @@ -26,6 +26,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.MultiColumnPrinter.column; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER; import static java.util.concurrent.TimeUnit.*; import static org.forgerock.opendj.ldap.LdapException.*; @@ -40,7 +41,6 @@ import java.io.IOException; import java.io.PrintStream; -import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; @@ -293,7 +293,6 @@ protected Random initialValue() { private AddPerformanceRunner(final PerformanceRunnerOptions options) throws ArgumentException { super(options); - maxIterationsArgument.setPropertyName("maxNumberOfAdd"); } @Override @@ -441,45 +440,60 @@ int run(final String[] args) { /* Entries generation parameters */ resourcePathArg = - new StringArgument("resourcepath", 'r', MakeLDIF.OPTION_LONG_RESOURCE_PATH, false, false, true, - INFO_PATH_PLACEHOLDER.get(), null, null, INFO_ADDRATE_DESCRIPTION_RESOURCE_PATH.get()); - resourcePathArg.setDocDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RESOURCE_PATH.get()); - argParser.addArgument(resourcePathArg); + StringArgument.builder(MakeLDIF.OPTION_LONG_RESOURCE_PATH) + .shortIdentifier('r') + .description(INFO_ADDRATE_DESCRIPTION_RESOURCE_PATH.get()) + .docDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RESOURCE_PATH.get()) + .valuePlaceholder(INFO_PATH_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); randomSeedArg = - new IntegerArgument("randomseed", 'R', OPTION_LONG_RANDOM_SEED, false, false, true, - INFO_SEED_PLACEHOLDER.get(), 0, null, INFO_ADDRATE_DESCRIPTION_SEED.get()); - argParser.addArgument(randomSeedArg); - + IntegerArgument.builder(OPTION_LONG_RANDOM_SEED) + .shortIdentifier('R') + .description(INFO_ADDRATE_DESCRIPTION_SEED.get()) + .defaultValue(0) + .valuePlaceholder(INFO_SEED_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); constantsArg = - new StringArgument("constant", 'g', MakeLDIF.OPTION_LONG_CONSTANT, false, true, true, - INFO_CONSTANT_PLACEHOLDER.get(), null, null, INFO_ADDRATE_DESCRIPTION_CONSTANT.get()); - argParser.addArgument(constantsArg); + StringArgument.builder(MakeLDIF.OPTION_LONG_CONSTANT) + .shortIdentifier('g') + .description(INFO_ADDRATE_DESCRIPTION_CONSTANT.get()) + .multiValued() + .valuePlaceholder(INFO_CONSTANT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); /* addrate specifics arguments */ deleteMode = - new MultiChoiceArgument<>("deletemode", 'C', "deleteMode", false, true, - INFO_DELETEMODE_PLACEHOLDER.get(), Arrays.asList(DeleteStrategy.values()), false, - INFO_ADDRATE_DESCRIPTION_DELETEMODE.get()); - deleteMode.setDefaultValue(DeleteStrategy.FIFO.toString()); - argParser.addArgument(deleteMode); + MultiChoiceArgument.builder("deleteMode") + .shortIdentifier('C') + .description(INFO_ADDRATE_DESCRIPTION_DELETEMODE.get()) + .allowedValues(DeleteStrategy.values()) + .defaultValue(DeleteStrategy.FIFO) + .valuePlaceholder(INFO_DELETEMODE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); deleteSizeThreshold = - new IntegerArgument("deletesizethreshold", 's', "deleteSizeThreshold", false, false, true, - INFO_DELETESIZETHRESHOLD_PLACEHOLDER.get(), DEFAULT_SIZE_THRESHOLD, "deleteSizeThreshold", true, - SIZE_THRESHOLD_LOWERBOUND, false, Integer.MAX_VALUE, - INFO_ADDRATE_DESCRIPTION_DELETESIZETHRESHOLD.get()); - argParser.addArgument(deleteSizeThreshold); + IntegerArgument.builder("deleteSizeThreshold") + .shortIdentifier('s') + .description(INFO_ADDRATE_DESCRIPTION_DELETESIZETHRESHOLD.get()) + .lowerBound(SIZE_THRESHOLD_LOWERBOUND) + .defaultValue(DEFAULT_SIZE_THRESHOLD) + .valuePlaceholder(INFO_DELETESIZETHRESHOLD_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); deleteAgeThreshold = - new IntegerArgument("deleteagethreshold", 'a', "deleteAgeThreshold", false, true, - INFO_DELETEAGETHRESHOLD_PLACEHOLDER.get(), true, AGE_THRESHOLD_LOWERBOUND, false, - Integer.MAX_VALUE, INFO_ADDRATE_DESCRIPTION_DELETEAGETHRESHOLD.get()); - deleteAgeThreshold.setPropertyName(deleteAgeThreshold.getLongIdentifier()); - argParser.addArgument(deleteAgeThreshold); - - noPurgeArgument = new BooleanArgument("nopurge", 'n', "noPurge", INFO_ADDRATE_DESCRIPTION_NOPURGE.get()); - argParser.addArgument(noPurgeArgument); + IntegerArgument.builder("deleteAgeThreshold") + .shortIdentifier('a') + .description(INFO_ADDRATE_DESCRIPTION_DELETEAGETHRESHOLD.get()) + .lowerBound(AGE_THRESHOLD_LOWERBOUND) + .valuePlaceholder(INFO_DELETEAGETHRESHOLD_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + + noPurgeArgument = + BooleanArgument.builder("noPurge") + .shortIdentifier('n') + .description(INFO_ADDRATE_DESCRIPTION_NOPURGE.get()) + .buildAndAddToParser(argParser); } catch (final ArgumentException ae) { errPrintln(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage())); return ResultCode.CLIENT_SIDE_PARAM_ERROR.intValue(); @@ -530,8 +544,9 @@ private void addCommonArguments(final ArgumentParser argParser) throws ArgumentE argParser.addArgument(verbose); scriptFriendly = - new BooleanArgument("scriptFriendly", 'S', "scriptFriendly", INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()); - scriptFriendly.setPropertyName("scriptFriendly"); - argParser.addArgument(scriptFriendly); + BooleanArgument.builder("scriptFriendly") + .shortIdentifier('S') + .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) + .buildAndAddToParser(argParser); } } diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java index 881e5d3c8..14be107eb 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java @@ -424,41 +424,42 @@ int run(final String[] args) { argParser.setUsageArgument(showUsage, getOutputStream()); baseDN = - new StringArgument("baseDN", OPTION_SHORT_BASEDN, OPTION_LONG_BASEDN, false, - false, true, INFO_BASEDN_PLACEHOLDER.get(), null, null, - INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN.get()); - baseDN.setPropertyName(OPTION_LONG_BASEDN); - argParser.addArgument(baseDN); + StringArgument.builder(OPTION_LONG_BASEDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN.get()) + .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); searchScope = CommonArguments.getSearchScope(); argParser.addArgument(searchScope); dereferencePolicy = - new MultiChoiceArgument<>("derefpolicy", 'a', - "dereferencePolicy", false, true, INFO_DEREFERENCE_POLICE_PLACEHOLDER - .get(), DereferenceAliasesPolicy.values(), false, - INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()); - dereferencePolicy.setPropertyName("dereferencePolicy"); - dereferencePolicy.setDefaultValue(DereferenceAliasesPolicy.NEVER); - argParser.addArgument(dereferencePolicy); + MultiChoiceArgument.builder("dereferencePolicy") + .shortIdentifier('a') + .description(INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()) + .allowedValues(DereferenceAliasesPolicy.values()) + .defaultValue(DereferenceAliasesPolicy.NEVER) + .valuePlaceholder(INFO_DEREFERENCE_POLICE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); invalidCredPercent = - new IntegerArgument("invalidPassword", 'I', "invalidPassword", false, false, - true, LocalizableMessage.raw("{invalidPassword}"), 0, null, true, 0, - true, 100, LocalizableMessage - .raw("Percent of bind operations with simulated " - + "invalid password")); - invalidCredPercent.setPropertyName("invalidPassword"); - argParser.addArgument(invalidCredPercent); + IntegerArgument.builder("invalidPassword") + .shortIdentifier('I') + .description(LocalizableMessage.raw( + "Percent of bind operations with simulated invalid password")) + .range(0, 100) + .defaultValue(0) + .valuePlaceholder(LocalizableMessage.raw("{invalidPassword}")) + .buildAndAddToParser(argParser); verbose = CommonArguments.getVerbose(); argParser.addArgument(verbose); scriptFriendly = - new BooleanArgument("scriptFriendly", 'S', "scriptFriendly", - INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()); - scriptFriendly.setPropertyName("scriptFriendly"); - argParser.addArgument(scriptFriendly); + BooleanArgument.builder("scriptFriendly") + .shortIdentifier('S') + .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) + .buildAndAddToParser(argParser); } catch (final ArgumentException ae) { final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()); errPrintln(message); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java index b1f339fa1..799fd374c 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; @@ -177,11 +177,10 @@ int run(final String[] args) { argParser.addArgument(proxyAuthzID); assertionFilter = - new StringArgument("assertionfilter", null, OPTION_LONG_ASSERTION_FILE, false, - false, true, INFO_ASSERTION_FILTER_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_ASSERTION_FILTER.get()); - assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE); - argParser.addArgument(assertionFilter); + StringArgument.builder(OPTION_LONG_ASSERTION_FILE) + .description(INFO_DESCRIPTION_ASSERTION_FILTER.get()) + .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); controlStr = CommonArguments.getControl(); argParser.addArgument(controlStr); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java index c87a3dd0d..e9453f841 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java @@ -22,7 +22,7 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; @@ -259,14 +259,11 @@ int run(final String[] args) { BindRequest bindRequest; BooleanArgument continueOnError; - // TODO: Remove this due to new LDIF reader api? - BooleanArgument defaultAdd; BooleanArgument noop; BooleanArgument showUsage; IntegerArgument version; StringArgument assertionFilter; StringArgument controlStr; - StringArgument encodingStr; StringArgument filename; StringArgument postReadAttributes; StringArgument preReadAttributes; @@ -285,64 +282,55 @@ int run(final String[] args) { argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - defaultAdd = - new BooleanArgument("defaultAdd", 'a', "defaultAdd", - INFO_MODIFY_DESCRIPTION_DEFAULT_ADD.get()); - argParser.addArgument(defaultAdd); - + // TODO: Remove this due to new LDIF reader api? + BooleanArgument.builder("defaultAdd") + .shortIdentifier('a') + .description(INFO_MODIFY_DESCRIPTION_DEFAULT_ADD.get()) + .buildAndAddToParser(argParser); + + StringArgument.builder("encoding") + .shortIdentifier('i') + .description(INFO_DESCRIPTION_ENCODING.get()) + .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); filename = - new StringArgument("filename", OPTION_SHORT_FILENAME, OPTION_LONG_FILENAME, - false, false, true, INFO_FILE_PLACEHOLDER.get(), null, null, - INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get()); - filename.setPropertyName(OPTION_LONG_FILENAME); - argParser.addArgument(filename); - + StringArgument.builder(OPTION_LONG_FILENAME) + .shortIdentifier(OPTION_SHORT_FILENAME) + .description(INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); proxyAuthzID = - new StringArgument("proxy_authzid", OPTION_SHORT_PROXYAUTHID, - OPTION_LONG_PROXYAUTHID, false, false, true, - INFO_PROXYAUTHID_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_PROXY_AUTHZID.get()); - proxyAuthzID.setPropertyName(OPTION_LONG_PROXYAUTHID); - argParser.addArgument(proxyAuthzID); - + StringArgument.builder(OPTION_LONG_PROXYAUTHID) + .shortIdentifier(OPTION_SHORT_PROXYAUTHID) + .description(INFO_DESCRIPTION_PROXY_AUTHZID.get()) + .valuePlaceholder(INFO_PROXYAUTHID_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); assertionFilter = - new StringArgument("assertionfilter", null, OPTION_LONG_ASSERTION_FILE, false, - false, true, INFO_ASSERTION_FILTER_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_ASSERTION_FILTER.get()); - assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE); - argParser.addArgument(assertionFilter); - + StringArgument.builder(OPTION_LONG_ASSERTION_FILE) + .description(INFO_DESCRIPTION_ASSERTION_FILTER.get()) + .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); preReadAttributes = - new StringArgument("prereadattrs", null, "preReadAttributes", false, false, - true, INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_PREREAD_ATTRS.get()); - preReadAttributes.setPropertyName("preReadAttributes"); - argParser.addArgument(preReadAttributes); - + StringArgument.builder("preReadAttributes") + .description(INFO_DESCRIPTION_PREREAD_ATTRS.get()) + .valuePlaceholder(INFO_ATTRIBUTE_LIST_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); postReadAttributes = - new StringArgument("postreadattrs", null, "postReadAttributes", false, false, - true, INFO_ATTRIBUTE_LIST_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_POSTREAD_ATTRS.get()); - postReadAttributes.setPropertyName("postReadAttributes"); - argParser.addArgument(postReadAttributes); - + StringArgument.builder("postReadAttributes") + .description(INFO_DESCRIPTION_POSTREAD_ATTRS.get()) + .valuePlaceholder(INFO_ATTRIBUTE_LIST_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); controlStr = - new StringArgument("control", 'J', "control", false, true, true, - INFO_LDAP_CONTROL_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_CONTROLS.get()); - controlStr.setPropertyName("control"); - argParser.addArgument(controlStr); + StringArgument.builder("control") + .shortIdentifier('J') + .description(INFO_DESCRIPTION_CONTROLS.get()) + .multiValued() + .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); version = CommonArguments.getLdapVersion(); argParser.addArgument(version); - encodingStr = - new StringArgument("encoding", 'i', "encoding", false, false, true, - INFO_ENCODING_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_ENCODING - .get()); - encodingStr.setPropertyName("encoding"); - argParser.addArgument(encodingStr); - continueOnError = CommonArguments.getContinueOnError(); argParser.addArgument(continueOnError); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java index 22ed97ad0..81b04a25f 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java @@ -22,10 +22,13 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; +import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER; +import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE; +import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; @@ -127,46 +130,42 @@ private int run(final String[] args) { argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); newPW = - new StringArgument("newpw", 'n', "newPassword", false, false, true, - INFO_NEW_PASSWORD_PLACEHOLDER.get(), null, null, - INFO_LDAPPWMOD_DESCRIPTION_NEWPW.get()); - newPW.setPropertyName("newPassword"); - argParser.addArgument(newPW); - + StringArgument.builder("newPassword") + .shortIdentifier('n') + .description(INFO_LDAPPWMOD_DESCRIPTION_NEWPW.get()) + .valuePlaceholder(INFO_NEW_PASSWORD_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); newPWFile = - new FileBasedArgument("newpwfile", 'F', "newPasswordFile", false, false, - INFO_FILE_PLACEHOLDER.get(), null, null, - INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE.get()); - newPWFile.setPropertyName("newPasswordFile"); - argParser.addArgument(newPWFile); - + FileBasedArgument.builder("newPasswordFile") + .shortIdentifier('F') + .description(INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); currentPW = - new StringArgument("currentpw", 'c', "currentPassword", false, false, true, - INFO_CURRENT_PASSWORD_PLACEHOLDER.get(), null, null, - INFO_LDAPPWMOD_DESCRIPTION_CURRENTPW.get()); - currentPW.setPropertyName("currentPassword"); - argParser.addArgument(currentPW); - + StringArgument.builder("currentPassword") + .shortIdentifier('c') + .description(INFO_LDAPPWMOD_DESCRIPTION_CURRENTPW.get()) + .valuePlaceholder(INFO_CURRENT_PASSWORD_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); currentPWFile = - new FileBasedArgument("currentpwfile", 'C', "currentPasswordFile", false, - false, INFO_FILE_PLACEHOLDER.get(), null, null, - INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE.get()); - currentPWFile.setPropertyName("currentPasswordFile"); - argParser.addArgument(currentPWFile); - + FileBasedArgument.builder("currentPasswordFile") + .shortIdentifier('C') + .description(INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); proxyAuthzID = - new StringArgument("authzid", 'a', "authzID", false, false, true, - INFO_PROXYAUTHID_PLACEHOLDER.get(), null, null, - INFO_LDAPPWMOD_DESCRIPTION_AUTHZID.get()); - proxyAuthzID.setPropertyName("authzID"); - argParser.addArgument(proxyAuthzID); - + StringArgument.builder("authzID") + .shortIdentifier('a') + .description(INFO_LDAPPWMOD_DESCRIPTION_AUTHZID.get()) + .valuePlaceholder(INFO_PROXYAUTHID_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); controlStr = - new StringArgument("control", 'J', "control", false, true, true, - INFO_LDAP_CONTROL_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_CONTROLS.get()); - controlStr.setPropertyName("control"); - argParser.addArgument(controlStr); + StringArgument.builder("control") + .shortIdentifier('J') + .description(INFO_DESCRIPTION_CONTROLS.get()) + .multiValued() + .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); version = CommonArguments.getLdapVersion(); argParser.addArgument(version); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index 1dcc3fad0..815375328 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -84,6 +84,12 @@ import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl; import com.forgerock.opendj.util.StaticUtils; +import static com.forgerock.opendj.cli.CliMessages.INFO_DESCRIPTION_SIMPLE_PAGE_SIZE; +import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT; +import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER; +import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults; import static org.forgerock.util.Utils.*; @@ -271,146 +277,132 @@ int run(final String[] args) { argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); baseDN = - new StringArgument("baseDN", OPTION_SHORT_BASEDN, OPTION_LONG_BASEDN, true, - false, true, INFO_BASEDN_PLACEHOLDER.get(), null, null, - INFO_SEARCH_DESCRIPTION_BASEDN.get()); - baseDN.setPropertyName(OPTION_LONG_BASEDN); - argParser.addArgument(baseDN); + StringArgument.builder(OPTION_LONG_BASEDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_SEARCH_DESCRIPTION_BASEDN.get()) + .required() + .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); searchScope = CommonArguments.getSearchScope(); argParser.addArgument(searchScope); filename = - new StringArgument("filename", OPTION_SHORT_FILENAME, OPTION_LONG_FILENAME, - false, false, true, INFO_FILE_PLACEHOLDER.get(), null, null, - INFO_SEARCH_DESCRIPTION_FILENAME.get()); - searchScope.setPropertyName(OPTION_LONG_FILENAME); - argParser.addArgument(filename); - + StringArgument.builder(OPTION_LONG_FILENAME) + .shortIdentifier(OPTION_SHORT_FILENAME) + .description(INFO_SEARCH_DESCRIPTION_FILENAME.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); proxyAuthzID = - new StringArgument("proxy_authzid", OPTION_SHORT_PROXYAUTHID, - OPTION_LONG_PROXYAUTHID, false, false, true, - INFO_PROXYAUTHID_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_PROXY_AUTHZID.get()); - proxyAuthzID.setPropertyName(OPTION_LONG_PROXYAUTHID); - argParser.addArgument(proxyAuthzID); - + StringArgument.builder(OPTION_LONG_PROXYAUTHID) + .shortIdentifier(OPTION_SHORT_PROXYAUTHID) + .description(INFO_DESCRIPTION_PROXY_AUTHZID.get()) + .valuePlaceholder(INFO_PROXYAUTHID_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); pSearchInfo = - new StringArgument("psearchinfo", 'C', "persistentSearch", false, false, true, - INFO_PSEARCH_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_PSEARCH_INFO.get()); - pSearchInfo.setPropertyName("persistentSearch"); - pSearchInfo.setDocDescriptionSupplement(SUPPLEMENT_DESCRIPTION_PSEARCH_INFO.get()); - argParser.addArgument(pSearchInfo); - + StringArgument.builder("persistentSearch") + .shortIdentifier('C') + .description(INFO_DESCRIPTION_PSEARCH_INFO.get()) + .docDescriptionSupplement(SUPPLEMENT_DESCRIPTION_PSEARCH_INFO.get()) + .valuePlaceholder(INFO_PSEARCH_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); simplePageSize = - new IntegerArgument("simplepagesize", null, "simplePageSize", false, false, - true, INFO_NUM_ENTRIES_PLACEHOLDER.get(), 1000, null, true, 1, false, - 0, INFO_DESCRIPTION_SIMPLE_PAGE_SIZE.get()); - simplePageSize.setPropertyName("simplePageSize"); - argParser.addArgument(simplePageSize); - + IntegerArgument.builder("simplePageSize") + .description(INFO_DESCRIPTION_SIMPLE_PAGE_SIZE.get()) + .lowerBound(1) + .defaultValue(1000) + .valuePlaceholder(INFO_NUM_ENTRIES_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); assertionFilter = - new StringArgument("assertionfilter", null, OPTION_LONG_ASSERTION_FILE, false, - false, true, INFO_ASSERTION_FILTER_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_ASSERTION_FILTER.get()); - assertionFilter.setPropertyName(OPTION_LONG_ASSERTION_FILE); - argParser.addArgument(assertionFilter); - + StringArgument.builder(OPTION_LONG_ASSERTION_FILE) + .description(INFO_DESCRIPTION_ASSERTION_FILTER.get()) + .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); matchedValuesFilter = - new StringArgument("matchedvalues", null, "matchedValuesFilter", false, true, - true, INFO_FILTER_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_MATCHED_VALUES_FILTER.get()); - matchedValuesFilter.setPropertyName("matchedValuesFilter"); - argParser.addArgument(matchedValuesFilter); - + StringArgument.builder("matchedValuesFilter") + .description(INFO_DESCRIPTION_MATCHED_VALUES_FILTER.get()) + .multiValued() + .valuePlaceholder(INFO_FILTER_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); sortOrder = - new StringArgument("sortorder", 'S', "sortOrder", false, false, true, - INFO_SORT_ORDER_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_SORT_ORDER.get()); - sortOrder.setPropertyName("sortOrder"); - argParser.addArgument(sortOrder); - + StringArgument.builder("sortOrder") + .shortIdentifier('S') + .description(INFO_DESCRIPTION_SORT_ORDER.get()) + .valuePlaceholder(INFO_SORT_ORDER_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); vlvDescriptor = - new StringArgument("vlvdescriptor", 'G', "virtualListView", false, false, true, - INFO_VLV_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_VLV.get()); - vlvDescriptor.setPropertyName("virtualListView"); - argParser.addArgument(vlvDescriptor); - + StringArgument.builder("virtualListView") + .shortIdentifier('G') + .description(INFO_DESCRIPTION_VLV.get()) + .valuePlaceholder(INFO_VLV_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); controlStr = - new StringArgument("control", 'J', "control", false, true, true, - INFO_LDAP_CONTROL_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_CONTROLS.get()); - controlStr.setPropertyName("control"); - controlStr.setDocDescriptionSupplement(SUPPLEMENT_DESCRIPTION_CONTROLS.get()); - argParser.addArgument(controlStr); - + StringArgument.builder("control") + .shortIdentifier('J') + .description(INFO_DESCRIPTION_CONTROLS.get()) + .docDescriptionSupplement(SUPPLEMENT_DESCRIPTION_CONTROLS.get()) + .multiValued() + .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); effectiveRightsUser = - new StringArgument("effectiveRightsUser", OPTION_SHORT_EFFECTIVERIGHTSUSER, - OPTION_LONG_EFFECTIVERIGHTSUSER, false, false, true, - INFO_PROXYAUTHID_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_EFFECTIVERIGHTS_USER.get()); - effectiveRightsUser.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSUSER); - argParser.addArgument(effectiveRightsUser); - + StringArgument.builder(OPTION_LONG_EFFECTIVERIGHTSUSER) + .shortIdentifier(OPTION_SHORT_EFFECTIVERIGHTSUSER) + .description(INFO_DESCRIPTION_EFFECTIVERIGHTS_USER.get()) + .valuePlaceholder(INFO_PROXYAUTHID_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); effectiveRightsAttrs = - new StringArgument("effectiveRightsAttrs", OPTION_SHORT_EFFECTIVERIGHTSATTR, - OPTION_LONG_EFFECTIVERIGHTSATTR, false, true, true, - INFO_ATTRIBUTE_PLACEHOLDER.get(), null, null, - INFO_DESCRIPTION_EFFECTIVERIGHTS_ATTR.get()); - effectiveRightsAttrs.setPropertyName(OPTION_LONG_EFFECTIVERIGHTSATTR); - argParser.addArgument(effectiveRightsAttrs); + StringArgument.builder(OPTION_LONG_EFFECTIVERIGHTSATTR) + .shortIdentifier(OPTION_SHORT_EFFECTIVERIGHTSATTR) + .description(INFO_DESCRIPTION_EFFECTIVERIGHTS_ATTR.get()) + .multiValued() + .valuePlaceholder(INFO_ATTRIBUTE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); version = CommonArguments.getLdapVersion(); argParser.addArgument(version); - final StringArgument encodingStr = - new StringArgument("encoding", 'i', "encoding", false, false, true, - INFO_ENCODING_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_ENCODING - .get()); - encodingStr.setPropertyName("encoding"); - argParser.addArgument(encodingStr); + StringArgument.builder("encoding") + .shortIdentifier('i') + .description(INFO_DESCRIPTION_ENCODING.get()) + .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); dereferencePolicy = - new MultiChoiceArgument<>("derefpolicy", 'a', - "dereferencePolicy", false, true, INFO_DEREFERENCE_POLICE_PLACEHOLDER - .get(), DereferenceAliasesPolicy.values(), false, - INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()); - dereferencePolicy.setPropertyName("dereferencePolicy"); - dereferencePolicy.setDefaultValue(DereferenceAliasesPolicy.NEVER); - argParser.addArgument(dereferencePolicy); - + MultiChoiceArgument.builder("dereferencePolicy") + .shortIdentifier('a') + .description(INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()) + .allowedValues(DereferenceAliasesPolicy.values()) + .defaultValue(DereferenceAliasesPolicy.NEVER) + .valuePlaceholder(INFO_DEREFERENCE_POLICE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); typesOnly = - new BooleanArgument("typesOnly", 'A', "typesOnly", INFO_DESCRIPTION_TYPES_ONLY - .get()); - typesOnly.setPropertyName("typesOnly"); - argParser.addArgument(typesOnly); - + BooleanArgument.builder("typesOnly") + .shortIdentifier('A') + .description(INFO_DESCRIPTION_TYPES_ONLY.get()) + .buildAndAddToParser(argParser); sizeLimit = - new IntegerArgument("sizeLimit", 'z', "sizeLimit", false, false, true, - INFO_SIZE_LIMIT_PLACEHOLDER.get(), 0, null, - INFO_SEARCH_DESCRIPTION_SIZE_LIMIT.get()); - sizeLimit.setPropertyName("sizeLimit"); - argParser.addArgument(sizeLimit); - + IntegerArgument.builder("sizeLimit") + .shortIdentifier('z') + .description(INFO_SEARCH_DESCRIPTION_SIZE_LIMIT.get()) + .defaultValue(0) + .valuePlaceholder(INFO_SIZE_LIMIT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); timeLimit = - new IntegerArgument("timeLimit", 'l', "timeLimit", false, false, true, - INFO_TIME_LIMIT_PLACEHOLDER.get(), 0, null, - INFO_SEARCH_DESCRIPTION_TIME_LIMIT.get()); - timeLimit.setPropertyName("timeLimit"); - argParser.addArgument(timeLimit); - + IntegerArgument.builder("timeLimit") + .shortIdentifier('l') + .description(INFO_SEARCH_DESCRIPTION_TIME_LIMIT.get()) + .defaultValue(0) + .valuePlaceholder(INFO_TIME_LIMIT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); dontWrap = - new BooleanArgument("dontwrap", 't', "dontWrap", INFO_DESCRIPTION_DONT_WRAP - .get()); - dontWrap.setPropertyName("dontWrap"); - argParser.addArgument(dontWrap); - + BooleanArgument.builder("dontWrap") + .shortIdentifier('t') + .description(INFO_DESCRIPTION_DONT_WRAP.get()) + .buildAndAddToParser(argParser); countEntries = - new BooleanArgument("countentries", null, "countEntries", - INFO_DESCRIPTION_COUNT_ENTRIES.get()); - countEntries.setPropertyName("countEntries"); - argParser.addArgument(countEntries); + BooleanArgument.builder("countEntries") + .description(INFO_DESCRIPTION_COUNT_ENTRIES.get()) + .buildAndAddToParser(argParser); final BooleanArgument continueOnError = CommonArguments.getContinueOnError(); argParser.addArgument(continueOnError); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java index d50c5094d..b54b7cb59 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java @@ -87,12 +87,13 @@ private int run(final String[] args) { final StringArgument outputFilename; try { outputFilename = - new StringArgument("outputFilename", OPTION_SHORT_OUTPUT_LDIF_FILENAME, - OPTION_LONG_OUTPUT_LDIF_FILENAME, false, false, true, - INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get(), "stdout", null, - INFO_LDIFDIFF_DESCRIPTION_OUTPUT_FILENAME - .get(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())); - argParser.addArgument(outputFilename); + StringArgument.builder(OPTION_LONG_OUTPUT_LDIF_FILENAME) + .shortIdentifier(OPTION_SHORT_OUTPUT_LDIF_FILENAME) + .description(INFO_LDIFDIFF_DESCRIPTION_OUTPUT_FILENAME.get( + INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())) + .defaultValue("stdout") + .valuePlaceholder(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); showUsage = CommonArguments.getShowUsage(); argParser.addArgument(showUsage); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java index f5a1ec12e..2ef4c34a3 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java @@ -21,7 +21,7 @@ * CDDL HEADER END * * - * Copyright 2012-2015 ForgeRock AS. + * Copyright 2012-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; @@ -94,12 +94,13 @@ private int run(final String[] args) { final StringArgument outputFilename; try { outputFilename = - new StringArgument("outputFilename", OPTION_SHORT_OUTPUT_LDIF_FILENAME, - OPTION_LONG_OUTPUT_LDIF_FILENAME, false, false, true, - INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get(), "stdout", null, - INFO_LDIFMODIFY_DESCRIPTION_OUTPUT_FILENAME - .get(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())); - argParser.addArgument(outputFilename); + StringArgument.builder(OPTION_LONG_OUTPUT_LDIF_FILENAME) + .shortIdentifier(OPTION_SHORT_OUTPUT_LDIF_FILENAME) + .description(INFO_LDIFMODIFY_DESCRIPTION_OUTPUT_FILENAME.get( + INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())) + .defaultValue("stdout") + .valuePlaceholder(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); continueOnError = CommonArguments.getContinueOnError(); argParser.addArgument(continueOnError); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java index f9aa79a60..3057645ae 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java @@ -26,6 +26,10 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT; +import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER; +import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; @@ -98,49 +102,49 @@ private int run(final String[] args) { final IntegerArgument sizeLimit; try { outputFilename = - new StringArgument("outputFilename", OPTION_SHORT_OUTPUT_LDIF_FILENAME, - OPTION_LONG_OUTPUT_LDIF_FILENAME, false, false, true, - INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get(), "stdout", null, - INFO_LDIFSEARCH_DESCRIPTION_OUTPUT_FILENAME - .get(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())); - argParser.addArgument(outputFilename); - + StringArgument.builder(OPTION_LONG_OUTPUT_LDIF_FILENAME) + .shortIdentifier(OPTION_SHORT_OUTPUT_LDIF_FILENAME) + .description(INFO_LDIFSEARCH_DESCRIPTION_OUTPUT_FILENAME.get( + INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get())) + .defaultValue("stdout") + .valuePlaceholder(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); baseDN = - new StringArgument("baseDN", OPTION_SHORT_BASEDN, OPTION_LONG_BASEDN, true, - false, true, INFO_BASEDN_PLACEHOLDER.get(), null, null, - INFO_SEARCH_DESCRIPTION_BASEDN.get()); - baseDN.setPropertyName(OPTION_LONG_BASEDN); - argParser.addArgument(baseDN); + StringArgument.builder(OPTION_LONG_BASEDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_SEARCH_DESCRIPTION_BASEDN.get()) + .required() + .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); searchScope = CommonArguments.getSearchScope(); argParser.addArgument(searchScope); filename = - new StringArgument("filename", OPTION_SHORT_FILENAME, OPTION_LONG_FILENAME, - false, false, true, INFO_FILE_PLACEHOLDER.get(), null, null, - INFO_SEARCH_DESCRIPTION_FILENAME.get()); - searchScope.setPropertyName(OPTION_LONG_FILENAME); - argParser.addArgument(filename); - + StringArgument.builder(OPTION_LONG_FILENAME) + .shortIdentifier(OPTION_SHORT_FILENAME) + .description(INFO_SEARCH_DESCRIPTION_FILENAME.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); typesOnly = - new BooleanArgument("typesOnly", 'A', "typesOnly", INFO_DESCRIPTION_TYPES_ONLY - .get()); - typesOnly.setPropertyName("typesOnly"); - argParser.addArgument(typesOnly); - + BooleanArgument.builder("typesOnly") + .shortIdentifier('A') + .description(INFO_DESCRIPTION_TYPES_ONLY.get()) + .buildAndAddToParser(argParser); sizeLimit = - new IntegerArgument("sizeLimit", 'z', "sizeLimit", false, false, true, - INFO_SIZE_LIMIT_PLACEHOLDER.get(), 0, null, - INFO_SEARCH_DESCRIPTION_SIZE_LIMIT.get()); - sizeLimit.setPropertyName("sizeLimit"); - argParser.addArgument(sizeLimit); - + IntegerArgument.builder("sizeLimit") + .shortIdentifier('z') + .description(INFO_SEARCH_DESCRIPTION_SIZE_LIMIT.get()) + .defaultValue(0) + .valuePlaceholder(INFO_SIZE_LIMIT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); timeLimit = - new IntegerArgument("timeLimit", 'l', "timeLimit", false, false, true, - INFO_TIME_LIMIT_PLACEHOLDER.get(), 0, null, - INFO_SEARCH_DESCRIPTION_TIME_LIMIT.get()); - timeLimit.setPropertyName("timeLimit"); - argParser.addArgument(timeLimit); + IntegerArgument.builder("timeLimit") + .shortIdentifier('l') + .description(INFO_SEARCH_DESCRIPTION_TIME_LIMIT.get()) + .defaultValue(0) + .valuePlaceholder(INFO_TIME_LIMIT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); showUsage = CommonArguments.getShowUsage(); argParser.addArgument(showUsage); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java index 7347a0f28..bfc16432d 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java @@ -22,11 +22,13 @@ * * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS. + * Portions Copyright 2013-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.CliMessages.INFO_MAKELDIF_DESCRIPTION_SEED; +import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; @@ -90,28 +92,39 @@ int run(final String[] args) { StringArgument resourcePath; StringArgument constants; try { - resourcePath = new StringArgument("resourcepath", 'r', OPTION_LONG_RESOURCE_PATH, false, false, true, - INFO_PATH_PLACEHOLDER.get(), null, null, INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH.get()); - resourcePath.setDocDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RESOURCE_PATH.get()); - argParser.addArgument(resourcePath); - - ldifFile = new StringArgument("ldiffile", OPTION_SHORT_OUTPUT_LDIF_FILENAME, - OPTION_LONG_OUTPUT_LDIF_FILENAME, false, false, true, INFO_FILE_PLACEHOLDER.get(), - null, null, INFO_MAKELDIF_DESCRIPTION_LDIF.get()); - argParser.addArgument(ldifFile); - - randomSeed = new IntegerArgument("randomseed", OPTION_SHORT_RANDOM_SEED, OPTION_LONG_RANDOM_SEED, false, - false, true, INFO_SEED_PLACEHOLDER.get(), 0, null, INFO_MAKELDIF_DESCRIPTION_SEED.get()); - argParser.addArgument(randomSeed); - - constants = new StringArgument("constant", 'c', OPTION_LONG_CONSTANT, false, true, true, - INFO_CONSTANT_PLACEHOLDER.get(), - null, null, INFO_MAKELDIF_DESCRIPTION_CONSTANT.get()); - argParser.addArgument(constants); - - showUsage = new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP, - INFO_MAKELDIF_DESCRIPTION_HELP.get()); - argParser.addArgument(showUsage); + resourcePath = + StringArgument.builder(OPTION_LONG_RESOURCE_PATH) + .shortIdentifier('r') + .description(INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH.get()) + .docDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RESOURCE_PATH.get()) + .valuePlaceholder(INFO_PATH_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + ldifFile = + StringArgument.builder(OPTION_LONG_OUTPUT_LDIF_FILENAME) + .shortIdentifier(OPTION_SHORT_OUTPUT_LDIF_FILENAME) + .description(INFO_MAKELDIF_DESCRIPTION_LDIF.get()) + .valuePlaceholder(INFO_FILE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + randomSeed = + IntegerArgument.builder(OPTION_LONG_RANDOM_SEED) + .shortIdentifier(OPTION_SHORT_RANDOM_SEED) + .description(INFO_MAKELDIF_DESCRIPTION_SEED.get()) + .defaultValue(0) + .valuePlaceholder(INFO_SEED_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + constants = + StringArgument.builder(OPTION_LONG_CONSTANT) + .shortIdentifier('c') + .description(INFO_MAKELDIF_DESCRIPTION_CONSTANT.get()) + .multiValued() + .valuePlaceholder(INFO_CONSTANT_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + showUsage = + BooleanArgument.builder(OPTION_LONG_HELP) + .shortIdentifier(OPTION_SHORT_HELP) + .description(INFO_MAKELDIF_DESCRIPTION_HELP.get()) + .buildAndAddToParser(argParser); + argParser.setUsageArgument(showUsage, getOutputStream()); } catch (ArgumentException ae) { errPrintln(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage())); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java index 85d499bb7..5a07ccae8 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java @@ -189,11 +189,12 @@ private int run(final String[] args) { argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); baseDN = - new StringArgument("targetDN", OPTION_SHORT_BASEDN, OPTION_LONG_TARGETDN, true, - false, true, INFO_TARGETDN_PLACEHOLDER.get(), null, null, - INFO_MODRATE_TOOL_DESCRIPTION_TARGETDN.get()); - baseDN.setPropertyName(OPTION_LONG_BASEDN); - argParser.addArgument(baseDN); + StringArgument.builder(OPTION_LONG_TARGETDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_MODRATE_TOOL_DESCRIPTION_TARGETDN.get()) + .required() + .valuePlaceholder(INFO_TARGETDN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); verbose = CommonArguments.getVerbose(); argParser.addArgument(verbose); @@ -203,10 +204,10 @@ private int run(final String[] args) { argParser.setUsageArgument(showUsage, getOutputStream()); scriptFriendly = - new BooleanArgument("scriptFriendly", 'S', "scriptFriendly", - INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()); - scriptFriendly.setPropertyName("scriptFriendly"); - argParser.addArgument(scriptFriendly); + BooleanArgument.builder("scriptFriendly") + .shortIdentifier('S') + .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) + .buildAndAddToParser(argParser); } catch (final ArgumentException ae) { final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()); errPrintln(message); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java index fb7da7f7d..38870e502 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java @@ -262,11 +262,15 @@ protected DataSource[] initialValue() { ArgumentParser argParser = options.getArgumentParser(); this.app = options.getConsoleApplication(); + numThreadsArgument = - new IntegerArgument("numThreads", 't', "numThreads", false, false, true, - LocalizableMessage.raw("{numThreads}"), 1, null, true, 1, false, 0, - LocalizableMessage.raw("Number of worker threads per connection")); - numThreadsArgument.setPropertyName("numThreads"); + IntegerArgument.builder("numThreads") + .shortIdentifier('t') + .description(LocalizableMessage.raw("Number of worker threads per connection")) + .lowerBound(1) + .defaultValue(1) + .valuePlaceholder(LocalizableMessage.raw("{numThreads}")) + .buildArgument(); if (options.supportsMultipleThreadsPerConnection()) { argParser.addArgument(numThreadsArgument); } else { @@ -274,87 +278,87 @@ protected DataSource[] initialValue() { } numConnectionsArgument = - new IntegerArgument("numConnections", 'c', "numConnections", false, false, true, - LocalizableMessage.raw("{numConnections}"), 1, null, true, 1, false, 0, - LocalizableMessage.raw("Number of connections")); - numConnectionsArgument.setPropertyName("numConnections"); - argParser.addArgument(numConnectionsArgument); - + IntegerArgument.builder("numConnections") + .shortIdentifier('c') + .description(LocalizableMessage.raw("Number of connections")) + .lowerBound(1) + .defaultValue(1) + .valuePlaceholder(LocalizableMessage.raw("{numConnections}")) + .buildAndAddToParser(argParser); maxIterationsArgument = - new IntegerArgument("maxIterations", 'm', "maxIterations", false, false, true, - LocalizableMessage.raw("{maxIterations}"), 0, null, - LocalizableMessage.raw("Max iterations, 0 for unlimited")); - maxIterationsArgument.setPropertyName("maxIterations"); - argParser.addArgument(maxIterationsArgument); - + IntegerArgument.builder("maxIterations") + .shortIdentifier('m') + .description(LocalizableMessage.raw("Max iterations, 0 for unlimited")) + .defaultValue(0) + .valuePlaceholder(LocalizableMessage.raw("{maxIterations}")) + .buildAndAddToParser(argParser); maxDurationArgument = - new IntegerArgument("maxDuration", 'd', "maxDuration", false, false, true, - LocalizableMessage.raw("{maxDuration}"), 0, null, true, 1, false, 0, - LocalizableMessage.raw("Maximum duration in seconds, 0 for unlimited")); - argParser.addArgument(maxDurationArgument); - + IntegerArgument.builder("maxDuration") + .shortIdentifier('d') + .description(LocalizableMessage.raw("Maximum duration in seconds, 0 for unlimited")) + .lowerBound(1) + .defaultValue(0) + .valuePlaceholder(LocalizableMessage.raw("{maxDuration}")) + .buildAndAddToParser(argParser); warmUpArgument = - new IntegerArgument("warmUpDuration", 'B', "warmUpDuration", false, false, true, - LocalizableMessage.raw("{warmUpDuration}"), 0, null, - LocalizableMessage.raw("Warm up duration in seconds")); - argParser.addArgument(warmUpArgument); - + IntegerArgument.builder("warmUpDuration") + .shortIdentifier('B') + .description(LocalizableMessage.raw("Warm up duration in seconds")) + .defaultValue(0) + .valuePlaceholder(LocalizableMessage.raw("{warmUpDuration}")) + .buildAndAddToParser(argParser); statsIntervalArgument = - new IntegerArgument("statInterval", 'i', "statInterval", false, false, true, - LocalizableMessage.raw("{statInterval}"), 5, null, true, 1, false, 0, - LocalizableMessage.raw("Display results each specified number of seconds")); - statsIntervalArgument.setPropertyName("statInterval"); - argParser.addArgument(statsIntervalArgument); - + IntegerArgument.builder("statInterval") + .shortIdentifier('i') + .description(LocalizableMessage.raw("Display results each specified number of seconds")) + .lowerBound(1) + .defaultValue(5) + .valuePlaceholder(LocalizableMessage.raw("{statInterval}")) + .buildAndAddToParser(argParser); targetThroughputArgument = - new IntegerArgument("targetThroughput", 'M', "targetThroughput", false, false, - true, LocalizableMessage.raw("{targetThroughput}"), 0, null, - LocalizableMessage.raw("Target average throughput to achieve")); - targetThroughputArgument.setPropertyName("targetThroughput"); - argParser.addArgument(targetThroughputArgument); - + IntegerArgument.builder("targetThroughput") + .shortIdentifier('M') + .description(LocalizableMessage.raw("Target average throughput to achieve")) + .defaultValue(0) + .valuePlaceholder(LocalizableMessage.raw("{targetThroughput}")) + .buildAndAddToParser(argParser); percentilesArgument = - new IntegerArgument("percentile", 'e', "percentile", false, true, - LocalizableMessage.raw("{percentile}"), true, 0, true, 100, - LocalizableMessage.raw("Calculate max response time for a " - + "percentile of operations")); - percentilesArgument.setPropertyName("percentile"); - percentilesArgument.setMultiValued(true); - argParser.addArgument(percentilesArgument); - + IntegerArgument.builder("percentile") + .shortIdentifier('e') + .description( + LocalizableMessage.raw("Calculate max response time for a percentile of operations")) + .multiValued() + .range(0, 100) + .valuePlaceholder(LocalizableMessage.raw("{percentile}")) + .buildAndAddToParser(argParser); keepConnectionsOpen = - new BooleanArgument("keepConnectionsOpen", 'f', "keepConnectionsOpen", - LocalizableMessage.raw("Keep connections open")); - keepConnectionsOpen.setPropertyName("keepConnectionsOpen"); - argParser.addArgument(keepConnectionsOpen); - + BooleanArgument.builder("keepConnectionsOpen") + .shortIdentifier('f') + .description(LocalizableMessage.raw("Keep connections open")) + .buildAndAddToParser(argParser); noRebindArgument = - new BooleanArgument("noRebind", 'F', "noRebind", LocalizableMessage - .raw("Keep connections open and do not rebind")); - noRebindArgument.setPropertyName("noRebind"); + BooleanArgument.builder("noRebind") + .shortIdentifier('F') + .description(LocalizableMessage.raw("Keep connections open and do not rebind")) + .buildArgument(); if (options.supportsRebind()) { argParser.addArgument(noRebindArgument); } arguments = - new StringArgument( - "argument", - 'g', - "argument", - false, - true, - true, - LocalizableMessage.raw("{generator function or static string}"), - null, - null, - LocalizableMessage + StringArgument.builder("argument") + .shortIdentifier('g') + .description(LocalizableMessage .raw("Argument used to evaluate the Java " + "style format strings in program parameters (ie. Base DN, " + "Search Filter). The set of all arguments provided form the " + "the argument list in order. Besides static string " + "arguments, they can be generated per iteration with the " + "following functions: " + StaticUtils.EOL - + DataSource.getUsage())); + + DataSource.getUsage())) + .multiValued() + .valuePlaceholder(LocalizableMessage.raw("{generator function or static string}")) + .buildArgument(); if (options.supportsGeneratorArgument()) { argParser.addArgument(arguments); } diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java index f6d783136..0eb2592e0 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java @@ -241,32 +241,33 @@ private int run(final String[] args) { argParser.setUsageArgument(showUsage, getOutputStream()); baseDN = - new StringArgument("baseDN", OPTION_SHORT_BASEDN, OPTION_LONG_BASEDN, true, - false, true, INFO_BASEDN_PLACEHOLDER.get(), null, null, - INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN.get()); - baseDN.setPropertyName(OPTION_LONG_BASEDN); - argParser.addArgument(baseDN); + StringArgument.builder(OPTION_LONG_BASEDN) + .shortIdentifier(OPTION_SHORT_BASEDN) + .description(INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN.get()) + .required() + .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); searchScope = CommonArguments.getSearchScope(); argParser.addArgument(searchScope); dereferencePolicy = - new MultiChoiceArgument<>("derefpolicy", 'a', - "dereferencePolicy", false, true, INFO_DEREFERENCE_POLICE_PLACEHOLDER - .get(), DereferenceAliasesPolicy.values(), false, - INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()); - dereferencePolicy.setPropertyName("dereferencePolicy"); - dereferencePolicy.setDefaultValue(DereferenceAliasesPolicy.NEVER); - argParser.addArgument(dereferencePolicy); + MultiChoiceArgument.builder("dereferencePolicy") + .shortIdentifier('a') + .description(INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY.get()) + .allowedValues(DereferenceAliasesPolicy.values()) + .defaultValue(DereferenceAliasesPolicy.NEVER) + .valuePlaceholder(INFO_DEREFERENCE_POLICE_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); verbose = CommonArguments.getVerbose(); argParser.addArgument(verbose); scriptFriendly = - new BooleanArgument("scriptFriendly", 'S', "scriptFriendly", - INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()); - scriptFriendly.setPropertyName("scriptFriendly"); - argParser.addArgument(scriptFriendly); + BooleanArgument.builder("scriptFriendly") + .shortIdentifier('S') + .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) + .buildAndAddToParser(argParser); } catch (final ArgumentException ae) { final LocalizableMessage message = ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage()); errPrintln(message); From 90bb067ad833e9151cb6721db692b64736c19c22 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 4 Feb 2016 18:19:58 +0100 Subject: [PATCH 050/125] Code cleanup sdk PR-45 Rename CommonArguments.getFooBar() to CommonArguments.fooBarArgument(). Static import com.forgerock.opendj.cli.CommonArguments.* everywhere CommonArguments class is used. Plus in few places, related minor cleanup actions. --- .../forgerock/opendj/cli/CommonArguments.java | 414 ++++-------------- .../opendj/cli/ConnectionFactoryProvider.java | 37 +- .../forgerock/opendj/ldap/tools/AddRate.java | 10 +- .../forgerock/opendj/ldap/tools/AuthRate.java | 12 +- .../opendj/ldap/tools/LDAPCompare.java | 25 +- .../opendj/ldap/tools/LDAPModify.java | 17 +- .../opendj/ldap/tools/LDAPPasswordModify.java | 12 +- .../opendj/ldap/tools/LDAPSearch.java | 18 +- .../forgerock/opendj/ldap/tools/LDIFDiff.java | 5 +- .../opendj/ldap/tools/LDIFModify.java | 6 +- .../opendj/ldap/tools/LDIFSearch.java | 7 +- .../forgerock/opendj/ldap/tools/ModRate.java | 10 +- .../opendj/ldap/tools/SearchRate.java | 12 +- 13 files changed, 169 insertions(+), 416 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index bbd445384..951a2e50f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -49,7 +49,7 @@ private CommonArguments() { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getShowUsage() throws ArgumentException { + public static BooleanArgument showUsageArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_HELP) .shortIdentifier(OPTION_SHORT_HELP) .description(INFO_DESCRIPTION_SHOWUSAGE.get()) @@ -63,26 +63,13 @@ public static BooleanArgument getShowUsage() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getVerbose() throws ArgumentException { + public static BooleanArgument verboseArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_VERBOSE) .shortIdentifier(OPTION_SHORT_VERBOSE) .description(INFO_DESCRIPTION_VERBOSE.get()) .buildArgument(); } - /** - * Returns the "port" integer argument. - * - * @param defaultPort - * The default port number. - * @return The "port" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static IntegerArgument getPort(final int defaultPort) throws ArgumentException { - return getPort(defaultPort, null); - } - /** * Returns the "port" integer argument.
* N.B : the 'p' short option is also used by skipdecode(DBTest), @@ -96,7 +83,7 @@ public static IntegerArgument getPort(final int defaultPort) throws ArgumentExce * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getPort(final int defaultPort, final LocalizableMessage description) + public static IntegerArgument portArgument(final int defaultPort, final LocalizableMessage description) throws ArgumentException { return IntegerArgument.builder(OPTION_LONG_PORT) .shortIdentifier(OPTION_SHORT_PORT) @@ -114,7 +101,7 @@ public static IntegerArgument getPort(final int defaultPort, final LocalizableMe * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getPropertiesFile() throws ArgumentException { + public static StringArgument propertiesFileArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_PROP_FILE_PATH) .description(INFO_DESCRIPTION_PROP_FILE_PATH.get()) .valuePlaceholder(INFO_PROP_FILE_PATH_PLACEHOLDER.get()) @@ -128,7 +115,7 @@ public static StringArgument getPropertiesFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getProxyAuthId() throws ArgumentException { + public static StringArgument proxyAuthIdArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_PROXYAUTHID) .shortIdentifier(OPTION_SHORT_PROXYAUTHID) .description(INFO_DESCRIPTION_PROXYAUTHZID.get()) @@ -143,7 +130,7 @@ public static StringArgument getProxyAuthId() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getNoPropertiesFile() throws ArgumentException { + public static BooleanArgument noPropertiesFileArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_NO_PROP_FILE) .description(INFO_DESCRIPTION_NO_PROP_FILE.get()) .buildArgument(); @@ -157,7 +144,7 @@ public static BooleanArgument getNoPropertiesFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getContinueOnError() throws ArgumentException { + public static BooleanArgument continueOnErrorArgument() throws ArgumentException { return BooleanArgument.builder("continueOnError") .shortIdentifier('c') .description(INFO_DESCRIPTION_CONTINUE_ON_ERROR.get()) @@ -171,7 +158,7 @@ public static BooleanArgument getContinueOnError() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getControl() throws ArgumentException { + public static StringArgument controlArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_CONTROL) .shortIdentifier(OPTION_SHORT_CONTROL) .description(INFO_DESCRIPTION_CONTROLS.get()) @@ -188,7 +175,7 @@ public static StringArgument getControl() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getLdapVersion() throws ArgumentException { + public static IntegerArgument ldapVersionArgument() throws ArgumentException { return IntegerArgument.builder(OPTION_LONG_PROTOCOL_VERSION) .shortIdentifier(OPTION_SHORT_PROTOCOL_VERSION) .description(INFO_DESCRIPTION_VERSION.get()) @@ -204,7 +191,7 @@ public static IntegerArgument getLdapVersion() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getQuiet() throws ArgumentException { + public static BooleanArgument quietArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_QUIET) .shortIdentifier(OPTION_SHORT_QUIET) .description(INFO_DESCRIPTION_QUIET.get()) @@ -219,7 +206,7 @@ public static BooleanArgument getQuiet() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getNoOp() throws ArgumentException { + public static BooleanArgument noOpArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_DRYRUN) .shortIdentifier(OPTION_SHORT_DRYRUN) .description(INFO_DESCRIPTION_NOOP.get()) @@ -234,7 +221,7 @@ public static BooleanArgument getNoOp() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getNoPrompt() throws ArgumentException { + public static BooleanArgument noPromptArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_NO_PROMPT) .shortIdentifier(OPTION_SHORT_NO_PROMPT) .description(INFO_DESCRIPTION_NO_PROMPT.get()) @@ -248,31 +235,12 @@ public static BooleanArgument getNoPrompt() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getAcceptLicense() throws ArgumentException { + public static BooleanArgument acceptLicenseArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_ACCEPT_LICENSE) .description(INFO_OPTION_ACCEPT_LICENSE.get()) .buildArgument(); } - /** - * Returns the "timelimit" boolean argument.
- * N.B : the 't' short option is also used by targetldif, testonly, trustmanagerproviderdn, stoptime, - * start(dateTime). - * - * @return The "timelimit" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static IntegerArgument getTimeLimit() throws ArgumentException { - return IntegerArgument.builder("timeLimit") - .shortIdentifier('t') - .description(INFO_DESCRIPTION_TIME_LIMIT.get()) - .lowerBound(0) - .defaultValue(0) - .valuePlaceholder(INFO_TIME_LIMIT_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "trustAll" boolean argument. * @@ -280,30 +248,13 @@ public static IntegerArgument getTimeLimit() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getTrustAll() throws ArgumentException { + public static BooleanArgument trustAllArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_TRUSTALL) .shortIdentifier(OPTION_SHORT_TRUSTALL) .description(INFO_DESCRIPTION_TRUSTALL.get()) .buildArgument(); } - /** - * Returns the "trustmanagerproviderdn" string argument. - *
N.B : the 't' short option is also used by targetldif, timelimit, - * testonly, stoptime, start(dateTime) - * - * @return The "trustmanagerproviderdn" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getTrustManagerProviderDN() throws ArgumentException { - return StringArgument.builder("trustManagerProviderDN") - .shortIdentifier('t') - .description(INFO_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN.get()) - .valuePlaceholder(INFO_TRUST_MANAGER_PROVIDER_DN_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "trustStorePath" string argument. * @@ -311,8 +262,8 @@ public static StringArgument getTrustManagerProviderDN() throws ArgumentExceptio * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getTrustStorePath() throws ArgumentException { - return getTrustStorePath(null); + public static StringArgument trustStorePathArgument() throws ArgumentException { + return trustStorePathArgument(null); } /** @@ -324,7 +275,7 @@ public static StringArgument getTrustStorePath() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getTrustStorePath(final String defaultValue) throws ArgumentException { + public static StringArgument trustStorePathArgument(final String defaultValue) throws ArgumentException { return StringArgument.builder(OPTION_LONG_TRUSTSTOREPATH) .shortIdentifier(OPTION_SHORT_TRUSTSTOREPATH) .description(INFO_DESCRIPTION_TRUSTSTOREPATH.get()) @@ -333,20 +284,6 @@ public static StringArgument getTrustStorePath(final String defaultValue) throws .buildArgument(); } - /** - * Returns the "typesOnly" boolean argument. - * - * @return The "typesOnly" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getTypesOnly() throws ArgumentException { - return BooleanArgument.builder("typesOnly") - .shortIdentifier('A') - .description(INFO_DESCRIPTION_TYPES_ONLY.get()) - .buildArgument(); - } - /** * Returns the "truststorepw" string argument. * @@ -354,7 +291,7 @@ public static BooleanArgument getTypesOnly() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getTrustStorePassword() throws ArgumentException { + public static StringArgument trustStorePasswordArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_TRUSTSTORE_PWD) .shortIdentifier(OPTION_SHORT_TRUSTSTORE_PWD) .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD.get()) @@ -369,7 +306,7 @@ public static StringArgument getTrustStorePassword() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static FileBasedArgument getTrustStorePasswordFile() throws ArgumentException { + public static FileBasedArgument trustStorePasswordFileArgument() throws ArgumentException { return FileBasedArgument.builder(OPTION_LONG_TRUSTSTORE_PWD_FILE) .shortIdentifier(OPTION_SHORT_TRUSTSTORE_PWD_FILE) .description(INFO_DESCRIPTION_TRUSTSTOREPASSWORD_FILE.get()) @@ -384,8 +321,8 @@ public static FileBasedArgument getTrustStorePasswordFile() throws ArgumentExcep * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getConnectTimeOutHidden() throws ArgumentException { - return getConnectTimeOut(true); + public static IntegerArgument connectTimeOutHiddenArgument() throws ArgumentException { + return connectTimeOutArgument(true); } /** @@ -395,11 +332,11 @@ public static IntegerArgument getConnectTimeOutHidden() throws ArgumentException * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getConnectTimeOut() throws ArgumentException { - return getConnectTimeOut(false); + public static IntegerArgument connectTimeOutArgument() throws ArgumentException { + return connectTimeOutArgument(false); } - private static IntegerArgument getConnectTimeOut(final boolean hidden) throws ArgumentException { + private static IntegerArgument connectTimeOutArgument(final boolean hidden) throws ArgumentException { final IntegerArgument.Builder builder = IntegerArgument.builder(OPTION_LONG_CONNECT_TIMEOUT) .description(INFO_DESCRIPTION_CONNECTION_TIMEOUT.get()) .lowerBound(0) @@ -411,24 +348,6 @@ private static IntegerArgument getConnectTimeOut(final boolean hidden) throws Ar return builder.buildArgument(); } - - - /** - * Returns the "cleanupservice" string argument.
- * N.B : the 'c' short option is also used by continueOnError, compress. - * - * @return The "cleanupservice" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getCleanupService() throws ArgumentException { - return StringArgument.builder("cleanupService") - .shortIdentifier('c') - .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP.get()) - .valuePlaceholder(INFO_SERVICE_NAME_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "CLI" boolean argument.
* N.B : the 'i' short option is also used by encoding. @@ -437,7 +356,7 @@ public static StringArgument getCleanupService() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getCLI() throws ArgumentException { + public static BooleanArgument cliArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_CLI) .shortIdentifier(OPTION_SHORT_CLI) .description(INFO_ARGUMENT_DESCRIPTION_CLI.get()) @@ -452,15 +371,14 @@ public static BooleanArgument getCLI() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getConfigFile() throws ArgumentException { - final StringArgument configFile = StringArgument.builder("configFile") + public static StringArgument configFileArgument() throws ArgumentException { + return StringArgument.builder("configFile") .shortIdentifier('f') .description(INFO_DESCRIPTION_CONFIG_FILE.get()) .hidden() .required() .valuePlaceholder(INFO_CONFIGFILE_PLACEHOLDER.get()) .buildArgument(); - return configFile; } /** @@ -472,7 +390,7 @@ public static StringArgument getConfigFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getConfigClass(final String configFileHandlerName) throws ArgumentException { + public static StringArgument configClassArgument(final String configFileHandlerName) throws ArgumentException { return StringArgument.builder(OPTION_LONG_CONFIG_CLASS) .shortIdentifier(OPTION_SHORT_CONFIG_CLASS) .description(INFO_DESCRIPTION_CONFIG_CLASS.get()) @@ -483,40 +401,6 @@ public static StringArgument getConfigClass(final String configFileHandlerName) .buildArgument(); } - /** - * Returns the "backendid" string argument.
- * N.B : the 'n' short option is also used by newGroupName, no-prompt. - * - * @return The "backendid" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getBackendId() throws ArgumentException { - return StringArgument.builder("backendID") - .shortIdentifier('n') - .description(INFO_BACKUPDB_DESCRIPTION_BACKEND_ID.get()) - .multiValued() - .valuePlaceholder(INFO_BACKENDNAME_PLACEHOLDER.get()) - .buildArgument(); - } - - /** - * Returns the "backupdirectory" string argument.
- * N.B : the 'd' short option is also used by sampledata, disableservice. - * - * @return The "backupdirectory" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getBackupDirectory() throws ArgumentException { - return StringArgument.builder("backupDirectory") - .shortIdentifier('d') - .description(INFO_DESCRIPTION_BACKUP_DIR.get()) - .required() - .valuePlaceholder(INFO_BACKUPDIR_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "baseDN" string argument. * @@ -524,7 +408,7 @@ public static StringArgument getBackupDirectory() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getBaseDN() throws ArgumentException { + public static StringArgument baseDNArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_BASEDN) .shortIdentifier(OPTION_SHORT_BASEDN) .description(INFO_ARGUMENT_DESCRIPTION_BASEDN.get()) @@ -533,21 +417,6 @@ public static StringArgument getBaseDN() throws ArgumentException { .buildArgument(); } - /** - * Returns the "batchFilePath" string argument. - * - * @return The "batchFilePath" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getBatchFilePath() throws ArgumentException { - return StringArgument.builder(OPTION_LONG_BATCH_FILE_PATH) - .shortIdentifier(OPTION_SHORT_BATCH_FILE_PATH) - .description(INFO_DESCRIPTION_BATCH_FILE_PATH.get()) - .valuePlaceholder(INFO_BATCH_FILE_PATH_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "bindDN" string argument.
* N.B : the 'D' short option is also used by rootUserDN. @@ -558,7 +427,7 @@ public static StringArgument getBatchFilePath() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getBindDN(final String defaultBindDN) throws ArgumentException { + public static StringArgument bindDNArgument(final String defaultBindDN) throws ArgumentException { return StringArgument.builder(OPTION_LONG_BINDDN) .shortIdentifier(OPTION_SHORT_BINDDN) .description(INFO_DESCRIPTION_BINDDN.get()) @@ -574,7 +443,7 @@ public static StringArgument getBindDN(final String defaultBindDN) throws Argume * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getBindPassword() throws ArgumentException { + public static StringArgument bindPasswordArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_BINDPWD) .shortIdentifier(OPTION_SHORT_BINDPWD) .description(INFO_DESCRIPTION_BINDPASSWORD.get()) @@ -589,7 +458,7 @@ public static StringArgument getBindPassword() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static FileBasedArgument getBindPasswordFile() throws ArgumentException { + public static FileBasedArgument bindPasswordFileArgument() throws ArgumentException { return FileBasedArgument.builder(OPTION_LONG_BINDPWD_FILE) .shortIdentifier(OPTION_SHORT_BINDPWD_FILE) .description(INFO_DESCRIPTION_BINDPASSWORDFILE.get()) @@ -605,7 +474,7 @@ public static FileBasedArgument getBindPasswordFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getAddBaseEntry() throws ArgumentException { + public static BooleanArgument addBaseEntryArgument() throws ArgumentException { return BooleanArgument.builder("addBaseEntry") .shortIdentifier('a') .description(INFO_ARGUMENT_DESCRIPTION_ADDBASE.get()) @@ -620,7 +489,7 @@ public static BooleanArgument getAddBaseEntry() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getRejectedImportLdif() throws ArgumentException { + public static StringArgument rejectedImportLdifArgument() throws ArgumentException { return StringArgument.builder("rejectFile") .shortIdentifier('R') .description(INFO_GENERAL_DESCRIPTION_REJECTED_FILE.get()) @@ -636,7 +505,7 @@ public static StringArgument getRejectedImportLdif() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getRemote() throws ArgumentException { + public static BooleanArgument remoteArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_REMOTE) .shortIdentifier(OPTION_SHORT_REMOTE) .description(INFO_DESCRIPTION_REMOTE.get()) @@ -650,7 +519,7 @@ public static BooleanArgument getRemote() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getReportAuthzId() throws ArgumentException { + public static BooleanArgument reportAuthzIdArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_REPORT_AUTHZ_ID) .shortIdentifier('E') .description(INFO_DESCRIPTION_REPORT_AUTHZID.get()) @@ -665,7 +534,7 @@ public static BooleanArgument getReportAuthzId() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getRestart() throws ArgumentException { + public static BooleanArgument restartArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_RESTART) .shortIdentifier('R') .description(INFO_DESCRIPTION_RESTART.get()) @@ -679,7 +548,7 @@ public static BooleanArgument getRestart() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getSkippedImportFile() throws ArgumentException { + public static StringArgument skippedImportFileArgument() throws ArgumentException { return StringArgument.builder("skipFile") .description(INFO_GENERAL_DESCRIPTION_SKIPPED_FILE.get()) .valuePlaceholder(INFO_SKIP_FILE_PLACEHOLDER.get()) @@ -694,7 +563,7 @@ public static StringArgument getSkippedImportFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getSampleData() throws ArgumentException { + public static IntegerArgument sampleDataArgument() throws ArgumentException { return IntegerArgument.builder("sampleData") .shortIdentifier('d') .description(INFO_SETUP_DESCRIPTION_SAMPLE_DATA.get()) @@ -712,7 +581,7 @@ public static IntegerArgument getSampleData() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getSASL() throws ArgumentException { + public static StringArgument saslArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_SASLOPTION) .shortIdentifier(OPTION_SHORT_SASLOPTION) .description(INFO_LDAP_CONN_DESCRIPTION_SASLOPTIONS.get()) @@ -729,7 +598,7 @@ public static StringArgument getSASL() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static MultiChoiceArgument getSearchScope() throws ArgumentException { + public static MultiChoiceArgument searchScopeArgument() throws ArgumentException { return MultiChoiceArgument.builder(OPTION_LONG_SEARCHSCOPE) .shortIdentifier(OPTION_SHORT_SEARCHSCOPE) .description(INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE.get()) @@ -739,37 +608,6 @@ public static MultiChoiceArgument getSearchScope() throws ArgumentE .buildArgument(); } - /** - * Returns the "serverRoot" string argument.
- * N.B : the 'R' short option is also used by rejectfile, restart. - * - * @return The "serverRoot" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getServerRoot() throws ArgumentException { - return StringArgument.builder(OPTION_LONG_SERVER_ROOT) - .shortIdentifier(OPTION_SHORT_SERVER_ROOT) - .hidden() - .valuePlaceholder(INFO_SERVER_ROOT_DIR_PLACEHOLDER.get()) - .buildArgument(); - } - - /** - * Returns the "servicestate" boolean argument.
- * N.B : the 's' short option is also used by searchScope, sourceldif, randomSeed, script-friendly. - * - * @return The "servicestate" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getServiceState() throws ArgumentException { - return BooleanArgument.builder("serviceState") - .shortIdentifier('s') - .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE.get()) - .buildArgument(); - } - /** * Returns the "script-friendly" boolean argument.
* N.B : the 's' short option is also used by searchScope, servicestate, sourceldif, randomSeed. @@ -778,7 +616,7 @@ public static BooleanArgument getServiceState() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getScriptFriendly() throws ArgumentException { + public static BooleanArgument scriptFriendlyArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_SCRIPT_FRIENDLY) .shortIdentifier(OPTION_SHORT_SCRIPT_FRIENDLY) .description(INFO_DESCRIPTION_SCRIPT_FRIENDLY.get()) @@ -794,7 +632,7 @@ public static BooleanArgument getScriptFriendly() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getLDAPPort(final int defaultLdapPort) throws ArgumentException { + public static IntegerArgument ldapPortArgument(final int defaultLdapPort) throws ArgumentException { return IntegerArgument.builder("ldapPort") .shortIdentifier(OPTION_SHORT_PORT) .description(INFO_ARGUMENT_DESCRIPTION_LDAPPORT.get()) @@ -813,7 +651,7 @@ public static IntegerArgument getLDAPPort(final int defaultLdapPort) throws Argu * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getAdminLDAPPort(final int defaultAdminPort) throws ArgumentException { + public static IntegerArgument adminLdapPortArgument(final int defaultAdminPort) throws ArgumentException { return IntegerArgument.builder("adminConnectorPort") .description(INFO_ARGUMENT_DESCRIPTION_ADMINCONNECTORPORT.get()) .range(1, 65535) @@ -829,26 +667,12 @@ public static IntegerArgument getAdminLDAPPort(final int defaultAdminPort) throw * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getAdvancedMode() throws ArgumentException { + public static BooleanArgument advancedModeArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_ADVANCED) .description(INFO_DESCRIPTION_ADVANCED.get()) .buildArgument(); } - /** - * Returns the "assertionfilter" string argument. - * - * @return The "assertionfilter" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getAssertionFilter() throws ArgumentException { - return StringArgument.builder(OPTION_LONG_ASSERTION_FILE) - .description(INFO_DESCRIPTION_ASSERTION_FILTER.get()) - .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "JMX port" integer argument. * @@ -858,7 +682,7 @@ public static StringArgument getAssertionFilter() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getJMXPort(final int defaultJMXPort) throws ArgumentException { + public static IntegerArgument jmxPortArgument(final int defaultJMXPort) throws ArgumentException { return IntegerArgument.builder("jmxPort") .shortIdentifier('x') .description(INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()) @@ -869,13 +693,13 @@ public static IntegerArgument getJMXPort(final int defaultJMXPort) throws Argume } /** - * Returns the "skip port check" boolean argument. + * Returns the "skipPortCheck" boolean argument. * - * @return The "getSkipPortCheck" argument. + * @return The "skipPortCheck" argument. * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getSkipPortCheck() throws ArgumentException { + public static BooleanArgument skipPortCheckArgument() throws ArgumentException { return BooleanArgument.builder("skipPortCheck") .shortIdentifier('S') .description(INFO_ARGUMENT_DESCRIPTION_SKIPPORT.get()) @@ -889,45 +713,13 @@ public static BooleanArgument getSkipPortCheck() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getStartTLS() throws ArgumentException { + public static BooleanArgument startTLSArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_START_TLS) .shortIdentifier(OPTION_SHORT_START_TLS) .description(INFO_DESCRIPTION_START_TLS.get()) .buildArgument(); } - /** - * Returns the "stopreason" string argument.
- * N.B : the 'r' short option is also used by useSASLExternal, remote. - * - * @return The "stopreason" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getStopReason() throws ArgumentException { - return StringArgument.builder("stopReason") - .shortIdentifier('r') - .description(INFO_DESCRIPTION_STOP_REASON.get()) - .valuePlaceholder(INFO_STOP_REASON_PLACEHOLDER.get()) - .buildArgument(); - } - - /** - * Returns the "stopTime" string argument.
N.B : the 't' short option is also used by targetldif, timelimit, - * testonly, trustmanagerproviderdn, start(dateTime) - * - * @return The "stopTime" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getStopTime() throws ArgumentException { - return StringArgument.builder("stopTime") - .shortIdentifier('t') - .description(INFO_DESCRIPTION_STOP_TIME.get()) - .valuePlaceholder(INFO_STOP_TIME_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "rootUserDN" string argument.
* N.B : the 'D' short option is also used by bindDN. @@ -936,7 +728,7 @@ public static StringArgument getStopTime() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getRootDN() throws ArgumentException { + public static StringArgument rootDNArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_ROOT_USER_DN) .shortIdentifier(OPTION_SHORT_ROOT_USER_DN) .description(INFO_ARGUMENT_DESCRIPTION_ROOTDN.get()) @@ -952,7 +744,7 @@ public static StringArgument getRootDN() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getRootDNPwd() throws ArgumentException { + public static StringArgument rootDNPwdArgument() throws ArgumentException { return StringArgument.builder("rootUserPassword") .shortIdentifier(OPTION_SHORT_BINDPWD) .description(INFO_ROOT_USER_PWD_PLACEHOLDER.get()) @@ -967,7 +759,7 @@ public static StringArgument getRootDNPwd() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static FileBasedArgument getRootDNPwdFile() throws ArgumentException { + public static FileBasedArgument rootDNPwdFileArgument() throws ArgumentException { return FileBasedArgument.builder("rootUserPasswordFile") .shortIdentifier(OPTION_SHORT_BINDPWD_FILE) .description(INFO_ARGUMENT_DESCRIPTION_ROOTPWFILE.get()) @@ -982,7 +774,7 @@ public static FileBasedArgument getRootDNPwdFile() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getEnableWindowsService() throws ArgumentException { + public static BooleanArgument enableWindowsServiceArgument() throws ArgumentException { return BooleanArgument.builder("enableWindowsService") .shortIdentifier('e') .description(INFO_ARGUMENT_DESCRIPTION_ENABLE_WINDOWS_SERVICE.get()) @@ -997,7 +789,7 @@ public static BooleanArgument getEnableWindowsService() throws ArgumentException * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getEncoding() throws ArgumentException { + public static StringArgument encodingArgument() throws ArgumentException { return StringArgument.builder("encoding") .shortIdentifier('i') .description(INFO_DESCRIPTION_ENCODING.get()) @@ -1012,28 +804,13 @@ public static StringArgument getEncoding() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getDoNotStart() throws ArgumentException { + public static BooleanArgument doNotStartArgument() throws ArgumentException { return BooleanArgument.builder("doNotStart") .shortIdentifier('O') .description(INFO_SETUP_DESCRIPTION_DO_NOT_START.get()) .buildArgument(); } - /** - * Returns the "disableservice" boolean argument.
- * N.B : the 'd' short option is also used by backupdirectory, sampledata. - * - * @return The "disableservice" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static BooleanArgument getDisableService() throws ArgumentException { - return BooleanArgument.builder("disableService") - .shortIdentifier('d') - .description(INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_DISABLE.get()) - .buildArgument(); - } - /** * Returns the "displayCommand" boolean argument. * @@ -1041,7 +818,7 @@ public static BooleanArgument getDisableService() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getDisplayEquivalentCommand() throws ArgumentException { + public static BooleanArgument displayEquivalentCommandArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_DISPLAY_EQUIVALENT) .description(INFO_DESCRIPTION_DISPLAY_EQUIVALENT.get()) .buildArgument(); @@ -1056,7 +833,7 @@ public static BooleanArgument getDisplayEquivalentCommand() throws ArgumentExcep * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getEquivalentCommandFile(final LocalizableMessage description) + public static StringArgument equivalentCommandFileArgument(final LocalizableMessage description) throws ArgumentException { return StringArgument.builder(OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH) .description(description) @@ -1073,7 +850,7 @@ public static StringArgument getEquivalentCommandFile(final LocalizableMessage d * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getFilename(final LocalizableMessage description) throws ArgumentException { + public static StringArgument filenameArgument(final LocalizableMessage description) throws ArgumentException { return StringArgument.builder(OPTION_LONG_FILENAME) .shortIdentifier(OPTION_SHORT_FILENAME) .description(description) @@ -1088,7 +865,7 @@ public static StringArgument getFilename(final LocalizableMessage description) t * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getEnableTLS() throws ArgumentException { + public static BooleanArgument enableTLSArgument() throws ArgumentException { return BooleanArgument.builder("enableStartTLS") .shortIdentifier(OPTION_SHORT_START_TLS) .description(INFO_SETUP_DESCRIPTION_ENABLE_STARTTLS.get()) @@ -1105,7 +882,7 @@ public static BooleanArgument getEnableTLS() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static IntegerArgument getLDAPSPort(final int defaultSecurePort) throws ArgumentException { + public static IntegerArgument ldapsPortArgument(final int defaultSecurePort) throws ArgumentException { return IntegerArgument.builder("ldapsPort") .shortIdentifier(OPTION_SHORT_USE_SSL) .description(INFO_ARGUMENT_DESCRIPTION_LDAPSPORT.get()) @@ -1124,7 +901,7 @@ public static IntegerArgument getLDAPSPort(final int defaultSecurePort) throws A * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getLDIFFile(final LocalizableMessage description) throws ArgumentException { + public static StringArgument ldifFileArgument(final LocalizableMessage description) throws ArgumentException { return StringArgument.builder(OPTION_LONG_LDIF_FILE) .shortIdentifier(OPTION_SHORT_LDIF_FILE) .description(description) @@ -1140,7 +917,7 @@ public static StringArgument getLDIFFile(final LocalizableMessage description) t * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getGenerateSelfSigned() throws ArgumentException { + public static BooleanArgument generateSelfSignedArgument() throws ArgumentException { return BooleanArgument.builder("generateSelfSignedCertificate") .description(INFO_ARGUMENT_DESCRIPTION_USE_SELF_SIGNED_CERTIFICATE.get()) .buildArgument(); @@ -1155,8 +932,8 @@ public static BooleanArgument getGenerateSelfSigned() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getHostName(final String defaultHostName) throws ArgumentException { - return getHostName(defaultHostName, null); + public static StringArgument hostNameArgument(final String defaultHostName) throws ArgumentException { + return hostNameArgument(defaultHostName, null); } /** @@ -1170,7 +947,7 @@ public static StringArgument getHostName(final String defaultHostName) throws Ar * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getHostName(final String defaultHostName, final LocalizableMessage description) + public static StringArgument hostNameArgument(final String defaultHostName, final LocalizableMessage description) throws ArgumentException { return StringArgument.builder(OPTION_LONG_HOST) .shortIdentifier(OPTION_SHORT_HOST) @@ -1187,7 +964,7 @@ public static StringArgument getHostName(final String defaultHostName, final Loc * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getUsePKCS11Keystore() throws ArgumentException { + public static BooleanArgument usePKCS11KeystoreArgument() throws ArgumentException { return BooleanArgument.builder("usePkcs11Keystore") .description(INFO_ARGUMENT_DESCRIPTION_USE_PKCS11.get()) .buildArgument(); @@ -1200,7 +977,7 @@ public static BooleanArgument getUsePKCS11Keystore() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getUseJavaKeyStore() throws ArgumentException { + public static StringArgument useJavaKeyStoreArgument() throws ArgumentException { return StringArgument.builder("useJavaKeystore") .description(INFO_ARGUMENT_DESCRIPTION_USE_JAVAKEYSTORE.get()) .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) @@ -1214,7 +991,7 @@ public static StringArgument getUseJavaKeyStore() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getUseJCEKS() throws ArgumentException { + public static StringArgument useJCEKSArgument() throws ArgumentException { return StringArgument.builder("useJCEKS") .description(INFO_ARGUMENT_DESCRIPTION_USE_JCEKS.get()) .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) @@ -1228,7 +1005,7 @@ public static StringArgument getUseJCEKS() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getUsePKCS12KeyStore() throws ArgumentException { + public static StringArgument usePKCS12KeyStoreArgument() throws ArgumentException { return StringArgument.builder("usePkcs12keyStore") .description(INFO_ARGUMENT_DESCRIPTION_USE_PKCS12.get()) .valuePlaceholder(INFO_KEYSTOREPATH_PLACEHOLDER.get()) @@ -1243,43 +1020,13 @@ public static StringArgument getUsePKCS12KeyStore() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static BooleanArgument getUseSSL() throws ArgumentException { + public static BooleanArgument useSSLArgument() throws ArgumentException { return BooleanArgument.builder(OPTION_LONG_USE_SSL) .shortIdentifier(OPTION_SHORT_USE_SSL) .description(INFO_DESCRIPTION_USE_SSL.get()) .buildArgument(); } - /** - * Returns the "keymanagerpath" string argument. - * - * @return The "keymanagerpath" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getKeyManagerPath() throws ArgumentException { - return StringArgument.builder("keyManagerPath") - .shortIdentifier('m') - .description(INFO_DESCRIPTION_KEYMANAGER_PATH.get()) - .valuePlaceholder(INFO_KEY_MANAGER_PATH_PLACEHOLDER.get()) - .buildArgument(); - } - - /** - * Returns the "keymanagerproviderdn" string argument. - * - * @return The "keymanagerproviderdn" argument. - * @throws ArgumentException - * If there is a problem with any of the parameters used to create this argument. - */ - public static StringArgument getKeyManagerProviderDN() throws ArgumentException { - return StringArgument.builder("keyManagerProviderDN") - .shortIdentifier('k') - .description(INFO_DESCRIPTION_KEYMANAGER_PROVIDER_DN.get()) - .valuePlaceholder(INFO_KEY_MANAGER_PROVIDER_DN_PLACEHOLDER.get()) - .buildArgument(); - } - /** * Returns the "key store password" string argument. * @@ -1287,7 +1034,7 @@ public static StringArgument getKeyManagerProviderDN() throws ArgumentException * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getKeyStorePassword() throws ArgumentException { + public static StringArgument keyStorePasswordArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_KEYSTORE_PWD) .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD) .description(INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD.get()) @@ -1302,7 +1049,7 @@ public static StringArgument getKeyStorePassword() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static FileBasedArgument getKeyStorePasswordFile() throws ArgumentException { + public static FileBasedArgument keyStorePasswordFileArgument() throws ArgumentException { return FileBasedArgument.builder(OPTION_LONG_KEYSTORE_PWD_FILE) .shortIdentifier(OPTION_SHORT_KEYSTORE_PWD_FILE) .description(INFO_ARGUMENT_DESCRIPTION_KEYSTOREPASSWORD_FILE.get()) @@ -1317,7 +1064,7 @@ public static FileBasedArgument getKeyStorePasswordFile() throws ArgumentExcepti * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getKeyStorePath() throws ArgumentException { + public static StringArgument keyStorePathArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_KEYSTOREPATH) .shortIdentifier(OPTION_SHORT_KEYSTOREPATH) .description(INFO_DESCRIPTION_KEYSTOREPATH.get()) @@ -1332,7 +1079,7 @@ public static StringArgument getKeyStorePath() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getCertNickName() throws ArgumentException { + public static StringArgument certNickNameArgument() throws ArgumentException { return StringArgument.builder(OPTION_LONG_CERT_NICKNAME) .shortIdentifier(OPTION_SHORT_CERT_NICKNAME) .description(INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME.get()) @@ -1350,8 +1097,8 @@ public static StringArgument getCertNickName() throws ArgumentException { * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getAdminUid(final LocalizableMessage description) throws ArgumentException { - return getAdminUid(false, description); + public static StringArgument adminUid(final LocalizableMessage description) throws ArgumentException { + return adminUidArgument(false, description); } /** @@ -1363,11 +1110,12 @@ public static StringArgument getAdminUid(final LocalizableMessage description) t * @throws ArgumentException * If there is a problem with any of the parameters used to create this argument. */ - public static StringArgument getAdminUidHidden(final LocalizableMessage description) throws ArgumentException { - return getAdminUid(true, description); + public static StringArgument adminUidHiddenArgument(final LocalizableMessage description) + throws ArgumentException { + return adminUidArgument(true, description); } - private static StringArgument getAdminUid(final boolean hidden, final LocalizableMessage description) + private static StringArgument adminUidArgument(final boolean hidden, final LocalizableMessage description) throws ArgumentException { final StringArgument.Builder builder = StringArgument.builder(OPTION_LONG_ADMIN_UID) .shortIdentifier('I') diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index 4b8ba91d0..c12752266 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -34,6 +34,7 @@ import static org.forgerock.opendj.ldap.LDAPConnectionFactory.CONNECT_TIMEOUT; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.SSL_CONTEXT; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.SSL_USE_STARTTLS; +import static com.forgerock.opendj.cli.CommonArguments.*; import java.io.File; import java.io.FileInputStream; @@ -183,7 +184,7 @@ public ConnectionFactoryProvider(final ArgumentParser argumentParser, final boolean alwaysSSL) throws ArgumentException { this.app = app; - useSSLArg = CommonArguments.getUseSSL(); + useSSLArg = useSSLArgument(); if (!alwaysSSL) { argumentParser.addLdapConnectionArgument(useSSLArg); } else { @@ -191,7 +192,7 @@ public ConnectionFactoryProvider(final ArgumentParser argumentParser, useSSLArg.setPresent(true); } - useStartTLSArg = CommonArguments.getStartTLS(); + useStartTLSArg = startTLSArgument(); if (!alwaysSSL) { argumentParser.addLdapConnectionArgument(useStartTLSArg); } @@ -202,7 +203,7 @@ public ConnectionFactoryProvider(final ArgumentParser argumentParser, } catch (final Exception e) { defaultHostName = "Unknown (" + e + ")"; } - hostNameArg = CommonArguments.getHostName(defaultHostName); + hostNameArg = hostNameArgument(defaultHostName); argumentParser.addLdapConnectionArgument(hostNameArg); LocalizableMessage portDescription = INFO_DESCRIPTION_PORT.get(); @@ -210,49 +211,49 @@ public ConnectionFactoryProvider(final ArgumentParser argumentParser, portDescription = INFO_DESCRIPTION_ADMIN_PORT.get(); } - portArg = CommonArguments.getPort(defaultPort, portDescription); + portArg = portArgument(defaultPort, portDescription); argumentParser.addLdapConnectionArgument(portArg); - bindNameArg = CommonArguments.getBindDN(defaultBindDN); + bindNameArg = bindDNArgument(defaultBindDN); argumentParser.addLdapConnectionArgument(bindNameArg); - bindPasswordArg = CommonArguments.getBindPassword(); + bindPasswordArg = bindPasswordArgument(); argumentParser.addLdapConnectionArgument(bindPasswordArg); - bindPasswordFileArg = CommonArguments.getBindPasswordFile(); + bindPasswordFileArg = bindPasswordFileArgument(); argumentParser.addLdapConnectionArgument(bindPasswordFileArg); - saslOptionArg = CommonArguments.getSASL(); + saslOptionArg = saslArgument(); argumentParser.addLdapConnectionArgument(saslOptionArg); - trustAllArg = CommonArguments.getTrustAll(); + trustAllArg = trustAllArgument(); argumentParser.addLdapConnectionArgument(trustAllArg); - trustStorePathArg = CommonArguments.getTrustStorePath(); + trustStorePathArg = trustStorePathArgument(); argumentParser.addLdapConnectionArgument(trustStorePathArg); - trustStorePasswordArg = CommonArguments.getTrustStorePassword(); + trustStorePasswordArg = trustStorePasswordArgument(); argumentParser.addLdapConnectionArgument(trustStorePasswordArg); - trustStorePasswordFileArg = CommonArguments.getTrustStorePasswordFile(); + trustStorePasswordFileArg = trustStorePasswordFileArgument(); argumentParser.addLdapConnectionArgument(trustStorePasswordFileArg); - keyStorePathArg = CommonArguments.getKeyStorePath(); + keyStorePathArg = keyStorePathArgument(); argumentParser.addLdapConnectionArgument(keyStorePathArg); - keyStorePasswordArg = CommonArguments.getKeyStorePassword(); + keyStorePasswordArg = keyStorePasswordArgument(); argumentParser.addLdapConnectionArgument(keyStorePasswordArg); - keyStorePasswordFileArg = CommonArguments.getKeyStorePasswordFile(); + keyStorePasswordFileArg = keyStorePasswordFileArgument(); argumentParser.addLdapConnectionArgument(keyStorePasswordFileArg); - certNicknameArg = CommonArguments.getCertNickName(); + certNicknameArg = certNickNameArgument(); argumentParser.addLdapConnectionArgument(certNicknameArg); - reportAuthzIDArg = CommonArguments.getReportAuthzId(); + reportAuthzIDArg = reportAuthzIdArgument(); argumentParser.addArgument(reportAuthzIDArg); - connectTimeOut = CommonArguments.getConnectTimeOutHidden(); + connectTimeOut = connectTimeOutHiddenArgument(); argumentParser.addArgument(connectTimeOut); usePasswordPolicyControlArg = diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java index 0592a8f00..5badafb32 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java @@ -28,6 +28,7 @@ import static com.forgerock.opendj.cli.MultiColumnPrinter.column; import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER; import static java.util.concurrent.TimeUnit.*; +import static com.forgerock.opendj.cli.CommonArguments.*; import static org.forgerock.opendj.ldap.LdapException.*; import static org.forgerock.opendj.ldap.ResultCode.*; @@ -66,7 +67,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; @@ -528,19 +528,19 @@ int run(final String[] args) { } private void addCommonArguments(final ArgumentParser argParser) throws ArgumentException { - final StringArgument propertiesFileArgument = CommonArguments.getPropertiesFile(); + final StringArgument propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - final BooleanArgument noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + final BooleanArgument noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - final BooleanArgument showUsage = CommonArguments.getShowUsage(); + final BooleanArgument showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); scriptFriendly = diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java index 14be107eb..58f4df250 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java @@ -31,6 +31,7 @@ import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.ldap.tools.Utils.*; +import static com.forgerock.opendj.cli.CommonArguments.*; import java.io.PrintStream; import java.util.ArrayList; @@ -65,7 +66,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; @@ -411,15 +411,15 @@ int run(final String[] args) { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); runner = new BindPerformanceRunner(options); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); @@ -430,7 +430,7 @@ int run(final String[] args) { .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - searchScope = CommonArguments.getSearchScope(); + searchScope = searchScopeArgument(); argParser.addArgument(searchScope); dereferencePolicy = @@ -452,7 +452,7 @@ int run(final String[] args) { .valuePlaceholder(LocalizableMessage.raw("{invalidPassword}")) .buildAndAddToParser(argParser); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); scriptFriendly = diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java index 799fd374c..421525068 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java @@ -32,6 +32,8 @@ import static com.forgerock.opendj.cli.Utils.readBytesFromFile; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults; +import static com.forgerock.opendj.cli.CommonArguments.*; + import static org.forgerock.util.Utils.closeSilently; import java.io.BufferedReader; @@ -62,7 +64,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; @@ -162,18 +163,18 @@ int run(final String[] args) { try { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - filename = CommonArguments.getFilename(INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get()); + filename = filenameArgument(INFO_LDAPMODIFY_DESCRIPTION_FILENAME.get()); argParser.addArgument(filename); - proxyAuthzID = CommonArguments.getProxyAuthId(); + proxyAuthzID = proxyAuthIdArgument(); argParser.addArgument(proxyAuthzID); assertionFilter = @@ -182,25 +183,25 @@ int run(final String[] args) { .valuePlaceholder(INFO_ASSERTION_FILTER_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - controlStr = CommonArguments.getControl(); + controlStr = controlArgument(); argParser.addArgument(controlStr); - version = CommonArguments.getLdapVersion(); + version = ldapVersionArgument(); argParser.addArgument(version); - encodingStr = CommonArguments.getEncoding(); + encodingStr = encodingArgument(); argParser.addArgument(encodingStr); - continueOnError = CommonArguments.getContinueOnError(); + continueOnError = continueOnErrorArgument(); argParser.addArgument(continueOnError); - noop = CommonArguments.getNoOp(); + noop = noOpArgument(); argParser.addArgument(noop); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java index e9453f841..d7e28b9ea 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java @@ -31,6 +31,8 @@ import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults; +import static com.forgerock.opendj.cli.CommonArguments.*; + import static org.forgerock.util.Utils.closeSilently; import java.io.FileInputStream; @@ -72,7 +74,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; @@ -274,11 +275,11 @@ int run(final String[] args) { try { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); @@ -328,19 +329,19 @@ int run(final String[] args) { .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - version = CommonArguments.getLdapVersion(); + version = ldapVersionArgument(); argParser.addArgument(version); - continueOnError = CommonArguments.getContinueOnError(); + continueOnError = continueOnErrorArgument(); argParser.addArgument(continueOnError); - noop = CommonArguments.getNoOp(); + noop = noOpArgument(); argParser.addArgument(noop); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java index 81b04a25f..6594d3c71 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java @@ -31,6 +31,7 @@ import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; +import static com.forgerock.opendj.cli.CommonArguments.*; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteString; @@ -47,7 +48,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.FileBasedArgument; @@ -121,11 +121,11 @@ private int run(final String[] args) { try { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); @@ -167,13 +167,13 @@ private int run(final String[] args) { .valuePlaceholder(INFO_LDAP_CONTROL_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - version = CommonArguments.getLdapVersion(); + version = ldapVersionArgument(); argParser.addArgument(version); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index 815375328..599b23475 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -75,7 +75,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; @@ -97,6 +96,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.*; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; +import static com.forgerock.opendj.cli.CommonArguments.*; /** A tool that can be used to issue Search requests to the Directory Server. */ public final class LDAPSearch extends ConsoleApplication { @@ -268,11 +268,11 @@ int run(final String[] args) { try { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); final StringArgument propertiesFileArgument = - CommonArguments.getPropertiesFile(); + propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - final BooleanArgument noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + final BooleanArgument noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); @@ -284,7 +284,7 @@ int run(final String[] args) { .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - searchScope = CommonArguments.getSearchScope(); + searchScope = searchScopeArgument(); argParser.addArgument(searchScope); filename = @@ -358,7 +358,7 @@ int run(final String[] args) { .valuePlaceholder(INFO_ATTRIBUTE_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - version = CommonArguments.getLdapVersion(); + version = ldapVersionArgument(); argParser.addArgument(version); StringArgument.builder("encoding") @@ -404,16 +404,16 @@ int run(final String[] args) { .description(INFO_DESCRIPTION_COUNT_ENTRIES.get()) .buildAndAddToParser(argParser); - final BooleanArgument continueOnError = CommonArguments.getContinueOnError(); + final BooleanArgument continueOnError = continueOnErrorArgument(); argParser.addArgument(continueOnError); - noop = CommonArguments.getNoOp(); + noop = noOpArgument(); argParser.addArgument(noop); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); - final BooleanArgument showUsage = CommonArguments.getShowUsage(); + final BooleanArgument showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java index b54b7cb59..3e1c4cec2 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java @@ -30,6 +30,8 @@ import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_OUTPUT_LDIF_FILENAME; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; +import static com.forgerock.opendj.cli.CommonArguments.*; + import static org.forgerock.util.Utils.closeSilently; import java.io.FileInputStream; @@ -50,7 +52,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.StringArgument; @@ -95,7 +96,7 @@ private int run(final String[] args) { .valuePlaceholder(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java index 2ef4c34a3..69b14d6e7 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java @@ -30,6 +30,7 @@ import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; +import static com.forgerock.opendj.cli.CommonArguments.*; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -57,7 +58,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.StringArgument; @@ -102,10 +102,10 @@ private int run(final String[] args) { .valuePlaceholder(INFO_OUTPUT_LDIF_FILE_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - continueOnError = CommonArguments.getContinueOnError(); + continueOnError = continueOnErrorArgument(); argParser.addArgument(continueOnError); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java index 3057645ae..0e5f17953 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java @@ -32,6 +32,8 @@ import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; +import static com.forgerock.opendj.cli.CommonArguments.*; + import static org.forgerock.util.Utils.closeSilently; import java.io.BufferedReader; @@ -61,7 +63,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.IntegerArgument; import com.forgerock.opendj.cli.MultiChoiceArgument; @@ -117,7 +118,7 @@ private int run(final String[] args) { .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - searchScope = CommonArguments.getSearchScope(); + searchScope = searchScopeArgument(); argParser.addArgument(searchScope); filename = @@ -146,7 +147,7 @@ private int run(final String[] args) { .valuePlaceholder(INFO_TIME_LIMIT_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); } catch (final ArgumentException ae) { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java index 5a07ccae8..684033b74 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java @@ -41,7 +41,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.StringArgument; @@ -49,6 +48,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.*; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; +import static com.forgerock.opendj.cli.CommonArguments.*; /** * A load generation tool that can be used to load a Directory Server with @@ -180,11 +180,11 @@ private int run(final String[] args) { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); runner = new ModifyPerformanceRunner(new PerformanceRunnerOptions(argParser, this)); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); @@ -196,10 +196,10 @@ private int run(final String[] args) { .valuePlaceholder(INFO_TARGETDN_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java index 0eb2592e0..9f49e81aa 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java @@ -30,6 +30,7 @@ import static com.forgerock.opendj.cli.MultiColumnPrinter.column; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; +import static com.forgerock.opendj.cli.CommonArguments.*; import java.util.ArrayList; import java.util.Collections; @@ -56,7 +57,6 @@ import com.forgerock.opendj.cli.ArgumentException; import com.forgerock.opendj.cli.ArgumentParser; import com.forgerock.opendj.cli.BooleanArgument; -import com.forgerock.opendj.cli.CommonArguments; import com.forgerock.opendj.cli.ConnectionFactoryProvider; import com.forgerock.opendj.cli.ConsoleApplication; import com.forgerock.opendj.cli.MultiChoiceArgument; @@ -228,15 +228,15 @@ private int run(final String[] args) { connectionFactoryProvider = new ConnectionFactoryProvider(argParser, this); runner = new SearchPerformanceRunner(new PerformanceRunnerOptions(argParser, this)); - propertiesFileArgument = CommonArguments.getPropertiesFile(); + propertiesFileArgument = propertiesFileArgument(); argParser.addArgument(propertiesFileArgument); argParser.setFilePropertiesArgument(propertiesFileArgument); - noPropertiesFileArgument = CommonArguments.getNoPropertiesFile(); + noPropertiesFileArgument = noPropertiesFileArgument(); argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - showUsage = CommonArguments.getShowUsage(); + showUsage = showUsageArgument(); argParser.addArgument(showUsage); argParser.setUsageArgument(showUsage, getOutputStream()); @@ -248,7 +248,7 @@ private int run(final String[] args) { .valuePlaceholder(INFO_BASEDN_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - searchScope = CommonArguments.getSearchScope(); + searchScope = searchScopeArgument(); argParser.addArgument(searchScope); dereferencePolicy = @@ -260,7 +260,7 @@ private int run(final String[] args) { .valuePlaceholder(INFO_DEREFERENCE_POLICE_PLACEHOLDER.get()) .buildAndAddToParser(argParser); - verbose = CommonArguments.getVerbose(); + verbose = verboseArgument(); argParser.addArgument(verbose); scriptFriendly = From 578b35fe30d47991b7b80974a1d499ea5f83d359 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 9 Feb 2016 12:32:17 +0100 Subject: [PATCH 051/125] OPENDJSDK-42 Remove unused parameters PR-45 Those parameters were copied from the server tools but are not used any more since API changes. * ldapmodify * defaultAdd (-a, --defaultAdd) which is enabled by default in the sdk. * ldapmodify and ldapsearch * -i (--encoding {encoding}) which is actually completely ignored, a user can provide it with any value he wants and this will have no consequences at all. --- .../com/forgerock/opendj/ldap/tools/LDAPModify.java | 11 ----------- .../com/forgerock/opendj/ldap/tools/LDAPSearch.java | 6 ------ 2 files changed, 17 deletions(-) diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java index d7e28b9ea..a0e627e95 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java @@ -283,17 +283,6 @@ int run(final String[] args) { argParser.addArgument(noPropertiesFileArgument); argParser.setNoPropertiesFileArgument(noPropertiesFileArgument); - // TODO: Remove this due to new LDIF reader api? - BooleanArgument.builder("defaultAdd") - .shortIdentifier('a') - .description(INFO_MODIFY_DESCRIPTION_DEFAULT_ADD.get()) - .buildAndAddToParser(argParser); - - StringArgument.builder("encoding") - .shortIdentifier('i') - .description(INFO_DESCRIPTION_ENCODING.get()) - .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get()) - .buildAndAddToParser(argParser); filename = StringArgument.builder(OPTION_LONG_FILENAME) .shortIdentifier(OPTION_SHORT_FILENAME) diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index 599b23475..747d4ef58 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -361,12 +361,6 @@ int run(final String[] args) { version = ldapVersionArgument(); argParser.addArgument(version); - StringArgument.builder("encoding") - .shortIdentifier('i') - .description(INFO_DESCRIPTION_ENCODING.get()) - .valuePlaceholder(INFO_ENCODING_PLACEHOLDER.get()) - .buildAndAddToParser(argParser); - dereferencePolicy = MultiChoiceArgument.builder("dereferencePolicy") .shortIdentifier('a') From a480210cd7f045d264b5d00645bdb2cc2996929b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Fri, 12 Feb 2016 10:10:09 +0100 Subject: [PATCH 052/125] Added JCIP annotations to opendj-core --- opendj-core/pom.xml | 5 +++++ pom.xml | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index 83bd6da10..e40c04276 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -64,6 +64,11 @@ i18n-slf4j + + com.github.stephenc.jcip + jcip-annotations + + org.forgerock forgerock-build-tools diff --git a/pom.xml b/pom.xml index 1e0e619d1..dce77fc77 100644 --- a/pom.xml +++ b/pom.xml @@ -205,6 +205,13 @@ opendj-rest2ldap ${opendj.sdk.version} + + + + com.github.stephenc.jcip + jcip-annotations + 1.0-1 + From 2e3fe9cb5fa3f98c74643c6f8d710212bd575132 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 10 Feb 2016 22:07:19 +0100 Subject: [PATCH 053/125] Minor fix: change LdapPromise.thenFinally() to return an LdapPromise --- .../src/main/java/org/forgerock/opendj/ldap/LdapPromise.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java index dab296963..c568c090f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java @@ -22,7 +22,7 @@ * * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Portions copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; @@ -67,6 +67,9 @@ LdapPromise thenOnResultOrException(ResultHandler onResult, @Override LdapPromise thenAlways(Runnable onResultOrException); + @Override + LdapPromise thenFinally(Runnable onResultOrException); + @Override // @Checkstyle:ignore LdapPromise thenAsync(AsyncFunction onResult); From 26dcf4b4332eaf8795e895ac050c949251c808e7 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 10 Feb 2016 22:25:03 +0100 Subject: [PATCH 054/125] OPENDJSDK-16: refactoring work required for affinity based load-balancer Merged LoadBalancer and LoadBalancingAlgorithm hierarchies into a single class hierarchy in order to make it easier to implement request load- balancers: * LoadBalancer - abstract class providing common functionality for connection and request load-balancers * ConnectionLoadBalancer - abstract class for connection load-balancers (round-robin and fail-over) * ConnectionLoadBalancer - abstract class for connection load-balancers (round-robin and fail-over) * Connections - moved common load-balancing options to this class. --- .../ldap/AbstractLoadBalancingAlgorithm.java | 346 ------------------ .../opendj/ldap/ConnectionLoadBalancer.java | 70 ++++ .../forgerock/opendj/ldap/Connections.java | 102 ++++-- .../ldap/FailoverLoadBalancingAlgorithm.java | 53 --- .../forgerock/opendj/ldap/LoadBalancer.java | 289 +++++++++++++-- .../ldap/LoadBalancerEventListener.java | 8 +- .../opendj/ldap/LoadBalancingAlgorithm.java | 79 ---- .../RoundRobinLoadBalancingAlgorithm.java | 79 ---- ...estCase.java => LoadBalancerTestCase.java} | 8 +- .../forgerock/opendj/rest2ldap/Rest2LDAP.java | 4 +- 10 files changed, 416 insertions(+), 622 deletions(-) delete mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java create mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java delete mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java delete mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java delete mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java rename opendj-core/src/test/java/org/forgerock/opendj/ldap/{AbstractLoadBalancingAlgorithmTestCase.java => LoadBalancerTestCase.java} (94%) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java deleted file mode 100644 index 1c30dad10..000000000 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithm.java +++ /dev/null @@ -1,346 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. - */ -package org.forgerock.opendj.ldap; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledFuture; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.forgerock.i18n.LocalizableMessage; -import org.forgerock.i18n.slf4j.LocalizedLogger; -import org.forgerock.util.Options; -import org.forgerock.util.Reject; -import org.forgerock.util.AsyncFunction; -import org.forgerock.util.promise.Promise; - -import com.forgerock.opendj.util.ReferenceCountedObject; - -import static org.forgerock.opendj.ldap.LdapException.*; -import static org.forgerock.util.promise.Promises.*; - -import static com.forgerock.opendj.util.StaticUtils.*; - -/** - * An abstract load balancing algorithm providing monitoring and failover - * capabilities. - *

- * Implementations should override the method - * {@code getInitialConnectionFactoryIndex()} in order to provide the policy for - * selecting the first connection factory to use for each connection request. - */ -abstract class AbstractLoadBalancingAlgorithm implements LoadBalancingAlgorithm { - private final class MonitoredConnectionFactory implements ConnectionFactory, - LdapResultHandler { - - private final ConnectionFactory factory; - private final AtomicBoolean isOperational = new AtomicBoolean(true); - private volatile Promise pendingConnectPromise; - private final int index; - - private MonitoredConnectionFactory(final ConnectionFactory factory, final int index) { - this.factory = factory; - this.index = index; - } - - @Override - public void close() { - // Should we cancel the promise? - factory.close(); - } - - @Override - public Connection getConnection() throws LdapException { - final Connection connection; - try { - connection = factory.getConnection(); - } catch (LdapException e) { - // Attempt failed - try next factory. - notifyOffline(e); - final int nextIndex = (index + 1) % monitoredFactories.size(); - final MonitoredConnectionFactory nextFactory = - getMonitoredConnectionFactory(nextIndex); - return nextFactory.getConnection(); - } - notifyOnline(); - return connection; - } - - @Override - public Promise getConnectionAsync() { - return factory.getConnectionAsync().thenAsync( - new AsyncFunction() { - @Override - public Promise apply(Connection value) throws LdapException { - notifyOnline(); - return newResultPromise(value); - } - }, - new AsyncFunction() { - @Override - public Promise apply(LdapException error) throws LdapException { - // Attempt failed - try next factory. - notifyOffline(error); - final int nextIndex = (index + 1) % monitoredFactories.size(); - return getMonitoredConnectionFactory(nextIndex).getConnectionAsync(); - } - }); - } - - - - /** - * Handle monitoring connection request failure. - */ - @Override - public void handleException(final LdapException exception) { - notifyOffline(exception); - } - - /** - * Handle monitoring connection request success. - */ - @Override - public void handleResult(final Connection connection) { - // The connection is not going to be used, so close it immediately. - connection.close(); - notifyOnline(); - } - - @Override - public String toString() { - return factory.toString(); - } - - /** - * Attempt to connect to the factory if it is offline and there is no - * pending monitoring request. - */ - private synchronized void checkIfAvailable() { - if (!isOperational.get() && (pendingConnectPromise == null || pendingConnectPromise.isDone())) { - logger.debug(LocalizableMessage.raw("Attempting reconnect to offline factory '%s'", this)); - pendingConnectPromise = factory.getConnectionAsync().thenOnResult(this).thenOnException(this); - } - } - - private void notifyOffline(final LdapException error) { - // Save the error in case the load-balancer is exhausted. - lastFailure = error; - - if (isOperational.getAndSet(false)) { - // Transition from online to offline. - synchronized (listenerLock) { - try { - listener.handleConnectionFactoryOffline(factory, error); - } catch (RuntimeException e) { - handleListenerException(e); - } - } - - synchronized (stateLock) { - offlineFactoriesCount++; - if (offlineFactoriesCount == 1) { - logger.debug(LocalizableMessage.raw("Starting monitoring thread")); - monitoringFuture = - scheduler.get().scheduleWithFixedDelay(new MonitorRunnable(), 0, - monitoringIntervalMS, TimeUnit.MILLISECONDS); - } - } - } - } - - private void notifyOnline() { - if (!isOperational.getAndSet(true)) { - // Transition from offline to online. - synchronized (listenerLock) { - try { - listener.handleConnectionFactoryOnline(factory); - } catch (RuntimeException e) { - handleListenerException(e); - } - } - - synchronized (stateLock) { - offlineFactoriesCount--; - if (offlineFactoriesCount == 0) { - logger.debug(LocalizableMessage.raw("Stopping monitoring thread")); - - monitoringFuture.cancel(false); - monitoringFuture = null; - } - } - } - } - - private void handleListenerException(RuntimeException e) { - // TODO: I18N - logger.error(LocalizableMessage.raw("A run-time error occurred while processing a load-balancer event", e)); - } - } - - private final class MonitorRunnable implements Runnable { - private MonitorRunnable() { - // Nothing to do. - } - - @Override - public void run() { - for (final MonitoredConnectionFactory factory : monitoredFactories) { - factory.checkIfAvailable(); - } - } - } - - private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - - private final List monitoredFactories; - private final ReferenceCountedObject.Reference scheduler; - private final Object stateLock = new Object(); - - /** - * The last connection failure which caused a connection factory to be - * marked offline. This is used in order to help diagnose problems when the - * load-balancer has exhausted all of its factories. - */ - private volatile LdapException lastFailure; - - /** - * The event listener which should be notified when connection factories go - * on or off-line. - */ - private final LoadBalancerEventListener listener; - - /** - * Ensures that events are notified one at a time. - */ - private final Object listenerLock = new Object(); - - /** - * Guarded by stateLock. - */ - private int offlineFactoriesCount; - private final long monitoringIntervalMS; - - /** - * Guarded by stateLock. - */ - private ScheduledFuture monitoringFuture; - private final AtomicBoolean isClosed = new AtomicBoolean(); - - AbstractLoadBalancingAlgorithm(final Collection factories, final Options options) { - Reject.ifNull(factories, options); - - this.monitoredFactories = new ArrayList<>(factories.size()); - int i = 0; - for (final ConnectionFactory f : factories) { - this.monitoredFactories.add(new MonitoredConnectionFactory(f, i++)); - } - this.scheduler = DEFAULT_SCHEDULER.acquireIfNull(options.get(LOAD_BALANCER_SCHEDULER)); - this.monitoringIntervalMS = options.get(LOAD_BALANCER_MONITORING_INTERVAL).to(TimeUnit.MILLISECONDS); - this.listener = options.get(LOAD_BALANCER_EVENT_LISTENER); - } - - @Override - public void close() { - if (isClosed.compareAndSet(false, true)) { - synchronized (stateLock) { - if (monitoringFuture != null) { - monitoringFuture.cancel(false); - monitoringFuture = null; - } - } - for (ConnectionFactory factory : monitoredFactories) { - factory.close(); - } - scheduler.release(); - } - } - - @Override - public final ConnectionFactory getConnectionFactory() throws LdapException { - final int index = getInitialConnectionFactoryIndex(); - return getMonitoredConnectionFactory(index); - } - - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append(getAlgorithmName()); - builder.append('('); - boolean isFirst = true; - for (final ConnectionFactory factory : monitoredFactories) { - if (!isFirst) { - builder.append(','); - } else { - isFirst = false; - } - builder.append(factory); - } - builder.append(')'); - return builder.toString(); - } - - /** - * Returns the name of this load balancing algorithm. - * - * @return The name of this load balancing algorithm. - */ - abstract String getAlgorithmName(); - - /** - * Returns the index of the first connection factory which should be used in - * order to satisfy the next connection request. - * - * @return The index of the first connection factory which should be used in - * order to satisfy the next connection request. - */ - abstract int getInitialConnectionFactoryIndex(); - - /** Return the first factory after index which is operational. */ - private MonitoredConnectionFactory getMonitoredConnectionFactory(final int initialIndex) throws LdapException { - int index = initialIndex; - final int maxIndex = monitoredFactories.size(); - do { - final MonitoredConnectionFactory factory = monitoredFactories.get(index); - if (factory.isOperational.get()) { - return factory; - } - index = (index + 1) % maxIndex; - } while (index != initialIndex); - - /* - * All factories are offline so give up. We could have a configurable - * policy here such as waiting indefinitely, or for a configurable - * timeout period. - */ - throw newLdapException(ResultCode.CLIENT_SIDE_CONNECT_ERROR, - "No operational connection factories available", lastFailure); - } -} diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java new file mode 100644 index 000000000..95518b47f --- /dev/null +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java @@ -0,0 +1,70 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * 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 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 2016 ForgeRock AS. + */ +package org.forgerock.opendj.ldap; + +import static org.forgerock.util.promise.Promises.newExceptionPromise; + +import java.util.Collection; + +import org.forgerock.util.Options; +import org.forgerock.util.promise.Promise; + +/** + * An abstract connection based load balancer. Load balancing is performed when the application attempts to obtain a + * connection. + *

+ * Implementations should override the method {@code getInitialConnectionFactoryIndex()} in order to provide the policy + * for selecting the first connection factory to use for each connection request. + */ +abstract class ConnectionLoadBalancer extends LoadBalancer { + ConnectionLoadBalancer(final String loadBalancerName, + final Collection factories, + final Options options) { + super(loadBalancerName, factories, options); + } + + @Override + public final Connection getConnection() throws LdapException { + return getMonitoredConnectionFactory(getInitialConnectionFactoryIndex()).getConnection(); + } + + @Override + public final Promise getConnectionAsync() { + try { + return getMonitoredConnectionFactory(getInitialConnectionFactoryIndex()).getConnectionAsync(); + } catch (final LdapException e) { + return newExceptionPromise(e); + } + } + + /** + * Returns the index of the first connection factory which should be used in order to satisfy the next connection + * request. + * + * @return The index of the first connection factory which should be used in order to satisfy the next connection + * request. + */ + abstract int getInitialConnectionFactoryIndex(); +} diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java index da5300a86..ccffb0d94 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java @@ -22,28 +22,53 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Portions Copyright 2011-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; import static org.forgerock.opendj.ldap.RequestHandlerFactoryAdapter.adaptRequestHandler; +import static org.forgerock.util.time.Duration.duration; import java.net.InetAddress; import java.net.InetSocketAddress; import java.util.Collection; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; +import org.forgerock.util.Option; import org.forgerock.util.Options; import org.forgerock.util.Reject; import org.forgerock.util.promise.Promise; +import org.forgerock.util.time.Duration; /** * This class contains methods for creating and manipulating connection * factories and connections. */ public final class Connections { + /** + * Specifies the interval between successive attempts to reconnect to offline load-balanced connection factories. + * The default configuration is to attempt to reconnect every second. + */ + public static final Option LOAD_BALANCER_MONITORING_INTERVAL = Option.withDefault(duration("1 seconds")); + + /** + * Specifies the event listener which should be notified whenever a load-balanced connection factory changes state + * from online to offline or vice-versa. By default events will be logged to the {@code LoadBalancingAlgorithm} + * logger using the {@link LoadBalancerEventListener#LOG_EVENTS} listener. + */ + public static final Option LOAD_BALANCER_EVENT_LISTENER = + Option.of(LoadBalancerEventListener.class, LoadBalancerEventListener.LOG_EVENTS); + + /** + * Specifies the scheduler which will be used for periodically reconnecting to offline connection factories. A + * system-wide scheduler will be used by default. + */ + public static final Option LOAD_BALANCER_SCHEDULER = + Option.of(ScheduledExecutorService.class, null); + /** * Creates a new connection pool which creates new connections as needed * using the provided connection factory, but will reuse previously @@ -365,14 +390,15 @@ public static ConnectionFactory newInternalConnectionFactory( } /** - * Creates a new "round-robin" load-balance which will load-balance connections across the provided set of + * Creates a new "round-robin" load-balancer which will load-balance connections across the provided set of * connection factories. A round robin load balancing algorithm distributes connection requests across a list of * connection factories one at a time. When the end of the list is reached, the algorithm starts again from the * beginning. *

* This algorithm is typically used for load-balancing within data centers, where load must be distributed - * equally across multiple data sources. This algorithm contrasts with the {@link FailoverLoadBalancingAlgorithm} - * which is used for load-balancing between data centers. + * equally across multiple data sources. This algorithm contrasts with the + * {@link #newFailoverLoadBalancer(Collection, Options)} which is used for load-balancing between data + * centers. *

* If a problem occurs that temporarily prevents connections from being obtained for one of the connection * factories, then this algorithm automatically "fails over" to the next operational connection factory in the list. @@ -385,24 +411,55 @@ public static ConnectionFactory newInternalConnectionFactory( * @param factories * The connection factories. * @param options - * This configuration options for the load-balancer. See {@link LoadBalancingAlgorithm} for common options. + * This configuration options for the load-balancer. * @return The new round-robin load balancer. * @see #newFailoverLoadBalancer(Collection, Options) - * @see LoadBalancingAlgorithm + * @see #LOAD_BALANCER_EVENT_LISTENER + * @see #LOAD_BALANCER_MONITORING_INTERVAL + * @see #LOAD_BALANCER_SCHEDULER */ public static ConnectionFactory newRoundRobinLoadBalancer( final Collection factories, final Options options) { - return new LoadBalancer(new RoundRobinLoadBalancingAlgorithm(factories, options)); + return new ConnectionLoadBalancer("RoundRobinLoadBalancer", factories, options) { + private final int maxIndex = factories.size(); + private final AtomicInteger nextIndex = new AtomicInteger(-1); + + @Override + int getInitialConnectionFactoryIndex() { + // A round robin pool of one connection factories is unlikely in + // practice and requires special treatment. + if (maxIndex == 1) { + return 0; + } + + // Determine the next factory to use: avoid blocking algorithm. + int oldNextIndex; + int newNextIndex; + do { + oldNextIndex = nextIndex.get(); + newNextIndex = oldNextIndex + 1; + if (newNextIndex == maxIndex) { + newNextIndex = 0; + } + } while (!nextIndex.compareAndSet(oldNextIndex, newNextIndex)); + + // There's a potential, but benign, race condition here: other threads + // could jump in and rotate through the list before we return the + // connection factory. + return newNextIndex; + } + }; } /** - * Creates a new "fail-over" load-balance which will load-balance connections across the provided set of connection + * Creates a new "fail-over" load-balancer which will load-balance connections across the provided set of connection * factories. A fail-over load balancing algorithm provides fault tolerance across multiple underlying connection * factories. *

* This algorithm is typically used for load-balancing between data centers, where there is preference to * always forward connection requests to the closest available data center. This algorithm contrasts with the - * {@link RoundRobinLoadBalancingAlgorithm} which is used for load-balancing within a data center. + * {@link #newRoundRobinLoadBalancer(Collection, Options)} which is used for load-balancing within a data + * center. *

* This algorithm selects connection factories based on the order in which they were provided during construction. * More specifically, an attempt to obtain a connection factory will always return the first operational @@ -420,27 +477,22 @@ public static ConnectionFactory newRoundRobinLoadBalancer( * @param factories * The connection factories. * @param options - * This configuration options for the load-balancer. See {@link LoadBalancingAlgorithm} for common options. + * This configuration options for the load-balancer. * @return The new fail-over load balancer. * @see #newRoundRobinLoadBalancer(Collection, Options) - * @see LoadBalancingAlgorithm + * @see #LOAD_BALANCER_EVENT_LISTENER + * @see #LOAD_BALANCER_MONITORING_INTERVAL + * @see #LOAD_BALANCER_SCHEDULER */ public static ConnectionFactory newFailoverLoadBalancer( final Collection factories, final Options options) { - return new LoadBalancer(new FailoverLoadBalancingAlgorithm(factories, options)); - } - - /** - * Creates a new load balancer which will obtain connections using the provided load balancing algorithm. - * - * @param algorithm - * The load balancing algorithm which will be used to obtain the next - * @return The new load balancer. - * @throws NullPointerException - * If {@code algorithm} was {@code null}. - */ - public static ConnectionFactory newLoadBalancer(final LoadBalancingAlgorithm algorithm) { - return new LoadBalancer(algorithm); + return new ConnectionLoadBalancer("FailoverLoadBalancer", factories, options) { + @Override + int getInitialConnectionFactoryIndex() { + // Always start with the first connection factory. + return 0; + } + }; } /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java deleted file mode 100644 index 7290b01ad..000000000 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/FailoverLoadBalancingAlgorithm.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. - */ - -package org.forgerock.opendj.ldap; - -import java.util.Collection; - -import org.forgerock.util.Options; - -/** - * A fail-over load balancing algorithm provides fault tolerance across multiple - * underlying connection factories. - */ -final class FailoverLoadBalancingAlgorithm extends AbstractLoadBalancingAlgorithm { - FailoverLoadBalancingAlgorithm(final Collection factories, final Options options) { - super(factories, options); - } - - @Override - String getAlgorithmName() { - return "Failover"; - } - - @Override - int getInitialConnectionFactoryIndex() { - // Always start with the first connection factory. - return 0; - } -} diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java index 90e89c25b..eaa3bc152 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java @@ -22,58 +22,289 @@ * * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.forgerock.i18n.LocalizableMessage; +import org.forgerock.i18n.slf4j.LocalizedLogger; +import org.forgerock.util.Options; import org.forgerock.util.Reject; +import org.forgerock.util.AsyncFunction; import org.forgerock.util.promise.Promise; +import com.forgerock.opendj.util.ReferenceCountedObject; + +import static org.forgerock.opendj.ldap.Connections.*; +import static org.forgerock.opendj.ldap.LdapException.*; +import static org.forgerock.opendj.ldap.ResultCode.CLIENT_SIDE_CONNECT_ERROR; +import static org.forgerock.util.Utils.closeSilently; +import static org.forgerock.util.Utils.joinAsString; import static org.forgerock.util.promise.Promises.*; +import static com.forgerock.opendj.util.StaticUtils.*; + /** - * A load balancing connection factory allocates connections using the provided - * algorithm. + * An abstract load balancer providing common monitoring and failover capabilities. + *

+ * Implementations should override the {@link ConnectionFactory} methods and use the + * {@link #getMonitoredConnectionFactory(int)} method in order to obtain the desired load-balanced connection factory. + * If the requested connection factory is unavailable then a linear probe will be performed in order to the next + * suitable connection factory. */ -final class LoadBalancer implements ConnectionFactory { - private final LoadBalancingAlgorithm algorithm; +abstract class LoadBalancer implements ConnectionFactory { + LoadBalancer(final String loadBalancerName, + final Collection factories, + final Options options) { + Reject.ifNull(loadBalancerName, factories, options); - LoadBalancer(final LoadBalancingAlgorithm algorithm) { - Reject.ifNull(algorithm); - this.algorithm = algorithm; + this.loadBalancerName = loadBalancerName; + this.monitoredFactories = new ArrayList<>(factories.size()); + int i = 0; + for (final ConnectionFactory f : factories) { + this.monitoredFactories.add(new MonitoredConnectionFactory(f, i++)); + } + this.scheduler = DEFAULT_SCHEDULER.acquireIfNull(options.get(LOAD_BALANCER_SCHEDULER)); + this.monitoringIntervalMS = options.get(LOAD_BALANCER_MONITORING_INTERVAL).to(TimeUnit.MILLISECONDS); + this.listener = options.get(LOAD_BALANCER_EVENT_LISTENER); } @Override - public void close() { - // Delegate to the algorithm. - algorithm.close(); + public final void close() { + if (isClosed.compareAndSet(false, true)) { + synchronized (stateLock) { + if (monitoringFuture != null) { + monitoringFuture.cancel(false); + monitoringFuture = null; + } + } + closeSilently(monitoredFactories); + scheduler.release(); + } } @Override - public Connection getConnection() throws LdapException { - return algorithm.getConnectionFactory().getConnection(); + public final String toString() { + final StringBuilder builder = new StringBuilder(); + builder.append(loadBalancerName); + builder.append('('); + joinAsString(builder, ",", monitoredFactories); + builder.append(')'); + return builder.toString(); } - @Override - public Promise getConnectionAsync() { - final ConnectionFactory factory; + private final class MonitoredConnectionFactory implements ConnectionFactory, LdapResultHandler { + private final ConnectionFactory factory; + private final AtomicBoolean isOperational = new AtomicBoolean(true); + private volatile Promise pendingConnectPromise; + private final int index; - try { - factory = algorithm.getConnectionFactory(); - } catch (final LdapException e) { - return newExceptionPromise(e); + private MonitoredConnectionFactory(final ConnectionFactory factory, final int index) { + this.factory = factory; + this.index = index; } - return factory.getConnectionAsync(); + @Override + public void close() { + // Should we cancel the promise? + factory.close(); + } + + @Override + public Connection getConnection() throws LdapException { + final Connection connection; + try { + connection = factory.getConnection(); + } catch (LdapException e) { + // Attempt failed - try next factory. + notifyOffline(e); + final int nextIndex = (index + 1) % monitoredFactories.size(); + return getMonitoredConnectionFactory(nextIndex).getConnection(); + } + notifyOnline(); + return connection; + } + + @Override + public Promise getConnectionAsync() { + return factory.getConnectionAsync().thenAsync( + new AsyncFunction() { + @Override + public Promise apply(Connection value) throws LdapException { + notifyOnline(); + return newResultPromise(value); + } + }, + new AsyncFunction() { + @Override + public Promise apply(LdapException error) throws LdapException { + // Attempt failed - try next factory. + notifyOffline(error); + final int nextIndex = (index + 1) % monitoredFactories.size(); + return getMonitoredConnectionFactory(nextIndex).getConnectionAsync(); + } + }); + } + + /** Handle monitoring connection request failure. */ + @Override + public void handleException(final LdapException exception) { + notifyOffline(exception); + } + + /** Handle monitoring connection request success. */ + @Override + public void handleResult(final Connection connection) { + // The connection is not going to be used, so close it immediately. + connection.close(); + notifyOnline(); + } + + @Override + public String toString() { + return factory.toString(); + } + + /** Attempt to connect to the factory if it is offline and there is no pending monitoring request. */ + private synchronized void checkIfAvailable() { + if (!isOperational.get() && (pendingConnectPromise == null || pendingConnectPromise.isDone())) { + logger.debug(LocalizableMessage.raw("Attempting reconnect to offline factory '%s'", this)); + pendingConnectPromise = factory.getConnectionAsync().thenOnResult(this).thenOnException(this); + } + } + + private void notifyOffline(final LdapException error) { + // Save the error in case the load-balancer is exhausted. + lastFailure = error; + if (isOperational.getAndSet(false)) { + // Transition from online to offline. + synchronized (listenerLock) { + try { + listener.handleConnectionFactoryOffline(factory, error); + } catch (RuntimeException e) { + handleListenerException(e); + } + } + synchronized (stateLock) { + offlineFactoriesCount++; + if (offlineFactoriesCount == 1) { + logger.debug(LocalizableMessage.raw("Starting monitoring thread")); + monitoringFuture = + scheduler.get().scheduleWithFixedDelay(new MonitorRunnable(), 0, + monitoringIntervalMS, TimeUnit.MILLISECONDS); + } + } + } + } + + private void notifyOnline() { + if (!isOperational.getAndSet(true)) { + // Transition from offline to online. + synchronized (listenerLock) { + try { + listener.handleConnectionFactoryOnline(factory); + } catch (RuntimeException e) { + handleListenerException(e); + } + } + synchronized (stateLock) { + offlineFactoriesCount--; + if (offlineFactoriesCount == 0) { + logger.debug(LocalizableMessage.raw("Stopping monitoring thread")); + + monitoringFuture.cancel(false); + monitoringFuture = null; + } + } + } + } + + private void handleListenerException(RuntimeException e) { + // TODO: I18N + logger.error(LocalizableMessage.raw( + "A run-time error occurred while processing a load-balancer event", e)); + } } - @Override - public String toString() { - final StringBuilder builder = new StringBuilder(); - builder.append("LoadBalancer("); - builder.append(algorithm); - builder.append(')'); - return builder.toString(); + private final class MonitorRunnable implements Runnable { + private MonitorRunnable() { + // Nothing to do. + } + + @Override + public void run() { + for (final MonitoredConnectionFactory factory : monitoredFactories) { + factory.checkIfAvailable(); + } + } + } + + private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); + + private final String loadBalancerName; + private final List monitoredFactories; + private final ReferenceCountedObject.Reference scheduler; + private final Object stateLock = new Object(); + + /** + * The last connection failure which caused a connection factory to be + * marked offline. This is used in order to help diagnose problems when the + * load-balancer has exhausted all of its factories. + */ + private volatile LdapException lastFailure; + + /** The event listener which should be notified when connection factories go on or off-line. */ + private final LoadBalancerEventListener listener; + + /** Ensures that events are notified one at a time. */ + private final Object listenerLock = new Object(); + + /** Guarded by stateLock. */ + private int offlineFactoriesCount; + private final long monitoringIntervalMS; + + /** Guarded by stateLock. */ + private ScheduledFuture monitoringFuture; + private final AtomicBoolean isClosed = new AtomicBoolean(); + + /** + * Return the first available connection factory starting from {@code initialIndex}. + * + * @param initialIndex The index of the connection factory to be returned if operational. The index may be + * greater than the number of factories in which case this method will perform a modulus + * operation to bring it into range. NOTE: for performance reasons callers should attempt to + * use valid indexes because the modulus operation is relatively expensive. + * @return The first available connection factory starting from the initial index. + * @throws LdapException If no connection factories are available. + */ + final ConnectionFactory getMonitoredConnectionFactory(final int initialIndex) throws LdapException { + final int maxIndex = monitoredFactories.size(); + int index = initialIndex < maxIndex ? initialIndex : initialIndex % maxIndex; + do { + final MonitoredConnectionFactory factory = monitoredFactories.get(index); + if (factory.isOperational.get()) { + return factory; + } + index = (index + 1) % maxIndex; + } while (index != initialIndex); + + /* + * All factories are offline so give up. We could have a configurable + * policy here such as waiting indefinitely, or for a configurable + * timeout period. + */ + throw newLdapException(CLIENT_SIDE_CONNECT_ERROR, "No operational connection factories available", lastFailure); + } + + final String getLoadBalancerName() { + return loadBalancerName; } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java index fb1c1db6b..724d59de9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java @@ -20,7 +20,7 @@ * * CDDL HEADER END * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -40,16 +40,16 @@ * sent at a time. Event listener implementations should not need to be thread * safe. * - * @see LoadBalancingAlgorithm#LOAD_BALANCER_EVENT_LISTENER + * @see Connections#LOAD_BALANCER_EVENT_LISTENER */ public interface LoadBalancerEventListener extends EventListener { /** * An event listener implementation which logs events to the LoadBalancingAlgorithm logger. This event listener is - * the default implementation configured using the {@link LoadBalancingAlgorithm#LOAD_BALANCER_EVENT_LISTENER} + * the default implementation configured using the {@link Connections#LOAD_BALANCER_EVENT_LISTENER} * option. */ LoadBalancerEventListener LOG_EVENTS = new LoadBalancerEventListener() { - private final LocalizedLogger logger = LocalizedLogger.getLocalizedLogger(LoadBalancingAlgorithm.class); + private final LocalizedLogger logger = LocalizedLogger.getLocalizedLogger(LoadBalancer.class); @Override public void handleConnectionFactoryOnline(final ConnectionFactory factory) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java deleted file mode 100644 index eebdead5e..000000000 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancingAlgorithm.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS. - */ - -package org.forgerock.opendj.ldap; - -import static org.forgerock.util.time.Duration.duration; - -import java.io.Closeable; -import java.util.concurrent.ScheduledExecutorService; - -import org.forgerock.util.Option; -import org.forgerock.util.time.Duration; - -/** - * A load balancing algorithm distributes connection requests across one or more underlying connection factories in an - * implementation defined manner. - * - * @see Connections#newLoadBalancer(LoadBalancingAlgorithm) - */ -public interface LoadBalancingAlgorithm extends Closeable { - /** - * Specifies the interval between successive attempts to reconnect to offline load-balanced connection factories. - * The default configuration is to attempt to reconnect every second. - */ - Option LOAD_BALANCER_MONITORING_INTERVAL = Option.withDefault(duration("1 seconds")); - - /** - * Specifies the event listener which should be notified whenever a load-balanced connection factory changes state - * from online to offline or vice-versa. By default events will be logged to the {@code LoadBalancingAlgorithm} - * logger using the {@link LoadBalancerEventListener#LOG_EVENTS} listener. - */ - Option LOAD_BALANCER_EVENT_LISTENER = - Option.of(LoadBalancerEventListener.class, LoadBalancerEventListener.LOG_EVENTS); - - /** - * Specifies the scheduler which will be used for periodically reconnecting to offline connection factories. A - * system-wide scheduler will be used by default. - */ - Option LOAD_BALANCER_SCHEDULER = Option.of(ScheduledExecutorService.class, null); - - /** - * Releases any resources associated with this algorithm, including any associated connection factories. - */ - @Override - void close(); - - /** - * Returns a connection factory which should be used in order to satisfy the next connection request. - * - * @return The connection factory. - * @throws LdapException - * If no connection factories are available for use. - */ - ConnectionFactory getConnectionFactory() throws LdapException; -} diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java deleted file mode 100644 index 997fdaf7d..000000000 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RoundRobinLoadBalancingAlgorithm.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. - */ - -package org.forgerock.opendj.ldap; - -import java.util.Collection; -import java.util.concurrent.atomic.AtomicInteger; - -import org.forgerock.util.Options; - -/** - * A round robin load balancing algorithm distributes connection requests across a list of - * connection factories one at a time. When the end of the list is reached, the algorithm starts again from the - * beginning. - */ -final class RoundRobinLoadBalancingAlgorithm extends AbstractLoadBalancingAlgorithm { - private final int maxIndex; - private final AtomicInteger nextIndex = new AtomicInteger(-1); - - RoundRobinLoadBalancingAlgorithm(final Collection factories, final Options options) { - super(factories, options); - this.maxIndex = factories.size(); - } - - @Override - String getAlgorithmName() { - return "RoundRobin"; - } - - @Override - int getInitialConnectionFactoryIndex() { - // A round robin pool of one connection factories is unlikely in - // practice and requires special treatment. - if (maxIndex == 1) { - return 0; - } - - // Determine the next factory to use: avoid blocking algorithm. - int oldNextIndex; - int newNextIndex; - do { - oldNextIndex = nextIndex.get(); - newNextIndex = oldNextIndex + 1; - if (newNextIndex == maxIndex) { - newNextIndex = 0; - } - } while (!nextIndex.compareAndSet(oldNextIndex, newNextIndex)); - - // There's a potential, but benign, race condition here: other threads - // could jump in and rotate through the list before we return the - // connection factory. - return newNextIndex; - } - -} diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java similarity index 94% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java rename to opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java index d13164a12..d7e6ec64d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractLoadBalancingAlgorithmTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java @@ -21,18 +21,16 @@ * CDDL HEADER END * * - * Copyright 2014-2015 ForgeRock AS + * Copyright 2014-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; import static java.util.Arrays.asList; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; +import static org.forgerock.opendj.ldap.Connections.*; import static org.forgerock.opendj.ldap.Connections.newRoundRobinLoadBalancer; import static org.forgerock.opendj.ldap.LdapException.newLdapException; -import static org.forgerock.opendj.ldap.LoadBalancingAlgorithm.LOAD_BALANCER_EVENT_LISTENER; -import static org.forgerock.opendj.ldap.LoadBalancingAlgorithm.LOAD_BALANCER_MONITORING_INTERVAL; -import static org.forgerock.opendj.ldap.LoadBalancingAlgorithm.LOAD_BALANCER_SCHEDULER; import static org.forgerock.util.Options.defaultOptions; import static org.forgerock.util.promise.Promises.newExceptionPromise; import static org.forgerock.util.promise.Promises.newResultPromise; @@ -51,7 +49,7 @@ import org.testng.annotations.Test; @SuppressWarnings("javadoc") -public class AbstractLoadBalancingAlgorithmTestCase extends SdkTestCase { +public class LoadBalancerTestCase extends SdkTestCase { private static ConnectionFactory mockAsync(final ConnectionFactory mock) { return new ConnectionFactory() { @Override diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java index 10b8ee0df..8782d366f 100644 --- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java +++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/Rest2LDAP.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.rest2ldap; @@ -21,7 +21,7 @@ import static org.forgerock.opendj.ldap.Connections.newFailoverLoadBalancer; import static org.forgerock.opendj.ldap.Connections.newRoundRobinLoadBalancer; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*; -import static org.forgerock.opendj.ldap.LoadBalancingAlgorithm.LOAD_BALANCER_MONITORING_INTERVAL; +import static org.forgerock.opendj.ldap.Connections.LOAD_BALANCER_MONITORING_INTERVAL; import static org.forgerock.opendj.ldap.requests.Requests.newSearchRequest; import static org.forgerock.opendj.ldap.schema.CoreSchema.getEntryUUIDAttributeType; import static org.forgerock.opendj.rest2ldap.ReadOnUpdatePolicy.CONTROLS; From 4028901ce2e4b96b1ea9178ee41b64f47307643c Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 10 Feb 2016 22:29:04 +0100 Subject: [PATCH 055/125] OPENDJSDK-16: implement sharded request load-balancer Added RequestLoadBalancer as common base class for for request based load-balancers. Sharded load-balancer is implemented in Connections via a static factory method. --- .../forgerock/opendj/ldap/Connections.java | 134 +++ .../forgerock/opendj/ldap/LoadBalancer.java | 7 +- .../opendj/ldap/RequestLoadBalancer.java | 260 +++++ .../opendj/ldap/ConnectionsTestCase.java | 104 +- .../ldap/RequestLoadBalancerTestCase.java | 959 ++++++++++++++++++ .../org/forgerock/opendj/examples/Proxy.java | 87 +- 6 files changed, 1527 insertions(+), 24 deletions(-) create mode 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java create mode 100644 opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java index ccffb0d94..7bc89f483 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java @@ -34,12 +34,28 @@ import java.net.InetSocketAddress; import java.util.Collection; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; +import org.forgerock.opendj.ldap.requests.AddRequest; +import org.forgerock.opendj.ldap.requests.CRAMMD5SASLBindRequest; +import org.forgerock.opendj.ldap.requests.CompareRequest; +import org.forgerock.opendj.ldap.requests.DeleteRequest; +import org.forgerock.opendj.ldap.requests.DigestMD5SASLBindRequest; +import org.forgerock.opendj.ldap.requests.GSSAPISASLBindRequest; +import org.forgerock.opendj.ldap.requests.ModifyDNRequest; +import org.forgerock.opendj.ldap.requests.ModifyRequest; +import org.forgerock.opendj.ldap.requests.PasswordModifyExtendedRequest; +import org.forgerock.opendj.ldap.requests.PlainSASLBindRequest; +import org.forgerock.opendj.ldap.requests.Request; +import org.forgerock.opendj.ldap.requests.SearchRequest; +import org.forgerock.opendj.ldap.requests.SimpleBindRequest; +import org.forgerock.util.Function; import org.forgerock.util.Option; import org.forgerock.util.Options; import org.forgerock.util.Reject; +import org.forgerock.util.promise.NeverThrowsException; import org.forgerock.util.promise.Promise; import org.forgerock.util.time.Duration; @@ -413,6 +429,7 @@ public static ConnectionFactory newInternalConnectionFactory( * @param options * This configuration options for the load-balancer. * @return The new round-robin load balancer. + * @see #newShardedRequestLoadBalancer(Collection, Options) * @see #newFailoverLoadBalancer(Collection, Options) * @see #LOAD_BALANCER_EVENT_LISTENER * @see #LOAD_BALANCER_MONITORING_INTERVAL @@ -480,6 +497,7 @@ int getInitialConnectionFactoryIndex() { * This configuration options for the load-balancer. * @return The new fail-over load balancer. * @see #newRoundRobinLoadBalancer(Collection, Options) + * @see #newShardedRequestLoadBalancer(Collection, Options) * @see #LOAD_BALANCER_EVENT_LISTENER * @see #LOAD_BALANCER_MONITORING_INTERVAL * @see #LOAD_BALANCER_SCHEDULER @@ -495,6 +513,122 @@ int getInitialConnectionFactoryIndex() { }; } + /** + * Creates a new "sharded" load-balancer which will load-balance individual requests across the provided set of + * connection factories, each typically representing a single replica, using an algorithm that ensures that requests + * targeting a given DN will always be routed to the same replica. In other words, this load-balancer increases + * consistency whilst maintaining read-scalability by simulating a "single master" replication topology, where each + * replica is responsible for a subset of the entries. When a replica is unavailable the load-balancer "fails over" + * by performing a linear probe in order to find the next available replica thus ensuring high-availability when a + * network partition occurs while sacrificing consistency, since the unavailable replica may still be visible to + * other clients. + *

+ * This load-balancer distributes requests based on the hash of their target DN and handles all core operations, as + * well as any password modify extended requests and SASL bind requests which use authentication IDs having the + * "dn:" form. Note that subtree operations (searches, subtree deletes, and modify DN) are likely to include entries + * which are "mastered" on different replicas, so client applications should be more tolerant of inconsistencies. + * Requests that are either unrecognized or that do not have a parameter that may be considered to be a target DN + * will be routed randomly. + *

+ * NOTE: this connection factory returns fake connections, since real connections are obtained for each + * request. Therefore, the returned fake connections have certain limitations: abandon requests will be ignored + * since they cannot be routed; connection event listeners can be registered, but will only be notified when the + * fake connection is closed or when all of the connection factories are unavailable. + *

+ * NOTE: in deployments where there are multiple client applications, care should be taken to ensure that + * the factories are configured using the same ordering, otherwise requests will not be routed consistently + * across the client applications. + *

+ * The implementation periodically attempts to connect to failed connection factories in order to determine if they + * have become available again. + * + * @param factories + * The connection factories. + * @param options + * This configuration options for the load-balancer. + * @return The new affinity load balancer. + * @see #newRoundRobinLoadBalancer(Collection, Options) + * @see #newFailoverLoadBalancer(Collection, Options) + * @see #LOAD_BALANCER_EVENT_LISTENER + * @see #LOAD_BALANCER_MONITORING_INTERVAL + * @see #LOAD_BALANCER_SCHEDULER + */ + public static ConnectionFactory newShardedRequestLoadBalancer( + final Collection factories, final Options options) { + return new RequestLoadBalancer("ShardedRequestLoadBalancer", + factories, + options, + newShardedRequestLoadBalancerFunction(factories)); + } + + // Package private for testing. + static Function newShardedRequestLoadBalancerFunction( + final Collection factories) { + return new Function() { + private final int maxIndex = factories.size(); + + @Override + public Integer apply(final Request request) { + // Normalize the hash to a valid factory index, taking care of negative hash values and especially + // Integer.MIN_VALUE (see doc for Math.abs()). + final int index = computeIndexBasedOnDnHashCode(request); + return index == Integer.MIN_VALUE ? 0 : (Math.abs(index) % maxIndex); + } + + private int computeIndexBasedOnDnHashCode(final Request request) { + // The following conditions are ordered such that the most common operations appear first in order to + // reduce the average number of branches. A better solution would be to use a visitor, but a visitor + // would only apply to the core operations, not extended operations or SASL binds. + if (request instanceof SearchRequest) { + return ((SearchRequest) request).getName().hashCode(); + } else if (request instanceof ModifyRequest) { + return ((ModifyRequest) request).getName().hashCode(); + } else if (request instanceof SimpleBindRequest) { + return hashCodeOfDnString(((SimpleBindRequest) request).getName()); + } else if (request instanceof AddRequest) { + return ((AddRequest) request).getName().hashCode(); + } else if (request instanceof DeleteRequest) { + return ((DeleteRequest) request).getName().hashCode(); + } else if (request instanceof CompareRequest) { + return ((CompareRequest) request).getName().hashCode(); + } else if (request instanceof ModifyDNRequest) { + return ((ModifyDNRequest) request).getName().hashCode(); + } else if (request instanceof PasswordModifyExtendedRequest) { + return hashCodeOfAuthzid(((PasswordModifyExtendedRequest) request).getUserIdentityAsString()); + } else if (request instanceof PlainSASLBindRequest) { + return hashCodeOfAuthzid(((PlainSASLBindRequest) request).getAuthenticationID()); + } else if (request instanceof DigestMD5SASLBindRequest) { + return hashCodeOfAuthzid(((DigestMD5SASLBindRequest) request).getAuthenticationID()); + } else if (request instanceof GSSAPISASLBindRequest) { + return hashCodeOfAuthzid(((GSSAPISASLBindRequest) request).getAuthenticationID()); + } else if (request instanceof CRAMMD5SASLBindRequest) { + return hashCodeOfAuthzid(((CRAMMD5SASLBindRequest) request).getAuthenticationID()); + } else { + return distributeRequestAtRandom(); + } + } + + private int hashCodeOfAuthzid(final String authzid) { + if (authzid != null && authzid.startsWith("dn:")) { + return hashCodeOfDnString(authzid.substring(3)); + } + return distributeRequestAtRandom(); + } + + private int hashCodeOfDnString(final String dnString) { + try { + return DN.valueOf(dnString).hashCode(); + } catch (final IllegalArgumentException ignored) { + return distributeRequestAtRandom(); + } + } + + private int distributeRequestAtRandom() { + return ThreadLocalRandom.current().nextInt(0, maxIndex); + } + }; + } + /** * Creates a new connection factory which forwards connection requests to * the provided factory, but whose {@code toString} method will always diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java index eaa3bc152..76ded9f9c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java @@ -278,16 +278,13 @@ public void run() { /** * Return the first available connection factory starting from {@code initialIndex}. * - * @param initialIndex The index of the connection factory to be returned if operational. The index may be - * greater than the number of factories in which case this method will perform a modulus - * operation to bring it into range. NOTE: for performance reasons callers should attempt to - * use valid indexes because the modulus operation is relatively expensive. + * @param initialIndex The index of the connection factory to be returned if operational. * @return The first available connection factory starting from the initial index. * @throws LdapException If no connection factories are available. */ final ConnectionFactory getMonitoredConnectionFactory(final int initialIndex) throws LdapException { final int maxIndex = monitoredFactories.size(); - int index = initialIndex < maxIndex ? initialIndex : initialIndex % maxIndex; + int index = initialIndex; do { final MonitoredConnectionFactory factory = monitoredFactories.get(index); if (factory.isOperational.get()) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java new file mode 100644 index 000000000..b00775b51 --- /dev/null +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java @@ -0,0 +1,260 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * 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 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 2016 ForgeRock AS. + */ +package org.forgerock.opendj.ldap; + +import static org.forgerock.opendj.ldap.spi.LdapPromises.newFailedLdapPromise; +import static org.forgerock.util.Utils.closeSilently; +import static org.forgerock.util.promise.Promises.newResultPromise; + +import java.util.Collection; +import java.util.concurrent.atomic.AtomicReference; + +import org.forgerock.opendj.ldap.requests.AbandonRequest; +import org.forgerock.opendj.ldap.requests.AddRequest; +import org.forgerock.opendj.ldap.requests.BindRequest; +import org.forgerock.opendj.ldap.requests.CompareRequest; +import org.forgerock.opendj.ldap.requests.DeleteRequest; +import org.forgerock.opendj.ldap.requests.ExtendedRequest; +import org.forgerock.opendj.ldap.requests.ModifyDNRequest; +import org.forgerock.opendj.ldap.requests.ModifyRequest; +import org.forgerock.opendj.ldap.requests.Request; +import org.forgerock.opendj.ldap.requests.SearchRequest; +import org.forgerock.opendj.ldap.requests.UnbindRequest; +import org.forgerock.opendj.ldap.responses.BindResult; +import org.forgerock.opendj.ldap.responses.CompareResult; +import org.forgerock.opendj.ldap.responses.ExtendedResult; +import org.forgerock.opendj.ldap.responses.Result; +import org.forgerock.opendj.ldap.spi.ConnectionState; +import org.forgerock.opendj.ldap.spi.LdapPromises; +import org.forgerock.util.AsyncFunction; +import org.forgerock.util.Function; +import org.forgerock.util.Options; +import org.forgerock.util.promise.ExceptionHandler; +import org.forgerock.util.promise.NeverThrowsException; +import org.forgerock.util.promise.Promise; +import org.forgerock.util.promise.ResultHandler; + +/** + * A request based load balancer which load balances individual requests based on properties of the request, such as + * the target DN. + *

+ * Implementations should override the method {@code getInitialConnectionFactoryIndex()} in order to provide the policy + * for selecting the first connection factory to use for each request. + */ +final class RequestLoadBalancer extends LoadBalancer { + /** + * A function which returns the index of the first connection factory which should be used in order to satisfy the + * next request. Implementations may base the decision on properties of the provided request, such as the target DN, + * whether the request is a read or update request, etc. + */ + private final Function nextFactoryFunction; + + RequestLoadBalancer(final String loadBalancerName, + final Collection factories, + final Options options, + final Function nextFactoryFunction) { + super(loadBalancerName, factories, options); + this.nextFactoryFunction = nextFactoryFunction; + } + + @Override + public final Connection getConnection() throws LdapException { + return new ConnectionImpl(); + } + + @Override + public final Promise getConnectionAsync() { + return newResultPromise((Connection) new ConnectionImpl()); + } + + private class ConnectionImpl extends AbstractAsynchronousConnection { + private final ConnectionState state = new ConnectionState(); + + @Override + public String toString() { + return getLoadBalancerName() + "Connection"; + } + + @Override + public LdapPromise abandonAsync(final AbandonRequest request) { + // We cannot possibly route these correctly, so just drop them. + return LdapPromises.newSuccessfulLdapPromise(null); + } + + @Override + public LdapPromise addAsync( + final AddRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.addAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public void addConnectionEventListener(final ConnectionEventListener listener) { + state.addConnectionEventListener(listener); + } + + @Override + public LdapPromise bindAsync( + final BindRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.bindAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public void close(final UnbindRequest request, final String reason) { + state.notifyConnectionClosed(); + } + + @Override + public LdapPromise compareAsync( + final CompareRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.compareAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public LdapPromise deleteAsync( + final DeleteRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.deleteAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public LdapPromise extendedRequestAsync( + final ExtendedRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.extendedRequestAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public boolean isClosed() { + return state.isClosed(); + } + + @Override + public boolean isValid() { + return state.isValid(); + } + + @Override + public LdapPromise modifyAsync( + final ModifyRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.modifyAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public LdapPromise modifyDNAsync( + final ModifyDNRequest request, final IntermediateResponseHandler intermediateResponseHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.modifyDNAsync(request, intermediateResponseHandler); + } + }); + } + + @Override + public void removeConnectionEventListener(final ConnectionEventListener listener) { + state.removeConnectionEventListener(listener); + } + + @Override + public LdapPromise searchAsync( + final SearchRequest request, + final IntermediateResponseHandler intermediateResponseHandler, + final SearchResultHandler entryHandler) { + return getConnectionAndSendRequest(request, new AsyncFunction() { + @Override + public Promise apply(final Connection connection) throws LdapException { + return connection.searchAsync(request, intermediateResponseHandler, entryHandler); + } + }); + } + + private LdapPromise getConnectionAndSendRequest( + final Request request, final AsyncFunction sendRequest) { + if (state.isClosed()) { + throw new IllegalStateException(); + } + final AtomicReference connectionHolder = new AtomicReference<>(); + return getConnectionAsync(request) + .thenOnResult(new ResultHandler() { + @Override + public void handleResult(final Connection connection) { + connectionHolder.set(connection); + } + }) + .thenAsync(sendRequest) + .thenFinally(new Runnable() { + @Override + public void run() { + closeSilently(connectionHolder.get()); + } + }); + } + + private LdapPromise getConnectionAsync(final Request request) { + try { + final int index = nextFactoryFunction.apply(request); + final ConnectionFactory factory = getMonitoredConnectionFactory(index); + return LdapPromises.asPromise(factory.getConnectionAsync() + .thenOnException(new ExceptionHandler() { + @Override + public void handleException(final LdapException e) { + state.notifyConnectionError(false, e); + } + })); + } catch (final LdapException e) { + state.notifyConnectionError(false, e); + return newFailedLdapPromise(e); + } + } + } +} diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java index ff164c2b9..e589ce8bc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java @@ -21,14 +21,34 @@ * CDDL HEADER END * * - * Copyright 2013 ForgeRock AS + * Copyright 2013-2016 ForgeRock AS */ package org.forgerock.opendj.ldap; +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.forgerock.opendj.ldap.Connections.newShardedRequestLoadBalancerFunction; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; +import org.forgerock.opendj.ldap.requests.AddRequest; +import org.forgerock.opendj.ldap.requests.CRAMMD5SASLBindRequest; +import org.forgerock.opendj.ldap.requests.CompareRequest; +import org.forgerock.opendj.ldap.requests.DeleteRequest; +import org.forgerock.opendj.ldap.requests.DigestMD5SASLBindRequest; +import org.forgerock.opendj.ldap.requests.GSSAPISASLBindRequest; +import org.forgerock.opendj.ldap.requests.GenericExtendedRequest; +import org.forgerock.opendj.ldap.requests.ModifyDNRequest; +import org.forgerock.opendj.ldap.requests.ModifyRequest; +import org.forgerock.opendj.ldap.requests.PasswordModifyExtendedRequest; +import org.forgerock.opendj.ldap.requests.PlainSASLBindRequest; +import org.forgerock.opendj.ldap.requests.Request; +import org.forgerock.opendj.ldap.requests.SearchRequest; +import org.forgerock.opendj.ldap.requests.SimpleBindRequest; +import org.forgerock.util.Function; +import org.forgerock.util.promise.NeverThrowsException; import org.testng.annotations.Test; @SuppressWarnings("javadoc") @@ -57,4 +77,86 @@ public void testUncloseableConnectionUnbind() throws Exception { uncloseable.close(null, null); verifyZeroInteractions(connection); } + + @Test + public void shardedRequestLoadBalancerUsesConsistentIndexing() { + final Function f = + newShardedRequestLoadBalancerFunction(asList(mock(ConnectionFactory.class), + mock(ConnectionFactory.class))); + + // These two DNs have a different hash code. + final DN dn1 = DN.valueOf("cn=target1,dc=example,dc=com"); + final DN dn2 = DN.valueOf("cn=target2,dc=example,dc=com"); + + final AddRequest addRequest = mock(AddRequest.class); + when(addRequest.getName()).thenReturn(dn1, dn2); + final int dn1index = index(f, addRequest); + final int dn2index = index(f, addRequest); + assertThat(dn1index).isNotEqualTo(dn2index); + + final SimpleBindRequest simpleBindRequest = mock(SimpleBindRequest.class); + when(simpleBindRequest.getName()).thenReturn(dn1.toString(), dn2.toString()); + assertRequestsAreRoutedConsistently(f, simpleBindRequest, dn1index, dn2index); + + final CompareRequest compareRequest = mock(CompareRequest.class); + when(compareRequest.getName()).thenReturn(dn1, dn2); + assertRequestsAreRoutedConsistently(f, compareRequest, dn1index, dn2index); + + final DeleteRequest deleteRequest = mock(DeleteRequest.class); + when(deleteRequest.getName()).thenReturn(dn1, dn2); + assertRequestsAreRoutedConsistently(f, deleteRequest, dn1index, dn2index); + + final ModifyRequest modifyRequest = mock(ModifyRequest.class); + when(modifyRequest.getName()).thenReturn(dn1, dn2); + assertRequestsAreRoutedConsistently(f, modifyRequest, dn1index, dn2index); + + final ModifyDNRequest modifyDNRequest = mock(ModifyDNRequest.class); + when(modifyDNRequest.getName()).thenReturn(dn1, dn2); + assertRequestsAreRoutedConsistently(f, modifyDNRequest, dn1index, dn2index); + + final SearchRequest searchRequest = mock(SearchRequest.class); + when(searchRequest.getName()).thenReturn(dn1, dn2); + assertRequestsAreRoutedConsistently(f, searchRequest, dn1index, dn2index); + + // Authzid based operations. + final String authzid1 = "dn:" + dn1.toString(); + final String authzid2 = "dn:" + dn2.toString(); + + final PasswordModifyExtendedRequest passwordModifyRequest = mock(PasswordModifyExtendedRequest.class); + when(passwordModifyRequest.getUserIdentityAsString()).thenReturn(authzid1, authzid2); + assertRequestsAreRoutedConsistently(f, passwordModifyRequest, dn1index, dn2index); + + final PlainSASLBindRequest plainSASLBindRequest = mock(PlainSASLBindRequest.class); + when(plainSASLBindRequest.getAuthenticationID()).thenReturn(authzid1, authzid2); + assertRequestsAreRoutedConsistently(f, plainSASLBindRequest, dn1index, dn2index); + + final CRAMMD5SASLBindRequest cramMD5SASLBindRequest = mock(CRAMMD5SASLBindRequest.class); + when(cramMD5SASLBindRequest.getAuthenticationID()).thenReturn(authzid1, authzid2); + assertRequestsAreRoutedConsistently(f, cramMD5SASLBindRequest, dn1index, dn2index); + + final DigestMD5SASLBindRequest digestMD5SASLBindRequest = mock(DigestMD5SASLBindRequest.class); + when(digestMD5SASLBindRequest.getAuthenticationID()).thenReturn(authzid1, authzid2); + assertRequestsAreRoutedConsistently(f, digestMD5SASLBindRequest, dn1index, dn2index); + + final GSSAPISASLBindRequest gssapiSASLBindRequest = mock(GSSAPISASLBindRequest.class); + when(gssapiSASLBindRequest.getAuthenticationID()).thenReturn(authzid1, authzid2); + assertRequestsAreRoutedConsistently(f, gssapiSASLBindRequest, dn1index, dn2index); + + // Requests that have no target will return a random index, but since we only have one factory the index will + // always be 0. + final GenericExtendedRequest genericExtendedRequest = mock(GenericExtendedRequest.class); + assertThat(index(f, genericExtendedRequest)).isBetween(0, 1); + } + + private void assertRequestsAreRoutedConsistently(final Function f, + final Request r, + final int firstExpectedIndex, + final int secondExpectedIndex) { + assertThat(index(f, r)).isEqualTo(firstExpectedIndex); + assertThat(index(f, r)).isEqualTo(secondExpectedIndex); + } + + private int index(final Function function, final Request request) { + return function.apply(request); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java new file mode 100644 index 000000000..6500ff40b --- /dev/null +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java @@ -0,0 +1,959 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License, Version 1.0 only + * (the "License"). You may not use this file except in compliance + * with the License. + * + * 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 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 2016 ForgeRock AS. + */ +package org.forgerock.opendj.ldap; + +import static java.util.Arrays.asList; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.fail; +import static org.forgerock.opendj.ldap.LdapException.newLdapException; +import static org.forgerock.opendj.ldap.ResultCode.CLIENT_SIDE_CONNECT_ERROR; +import static org.forgerock.opendj.ldap.responses.Responses.newBindResult; +import static org.forgerock.opendj.ldap.responses.Responses.newCompareResult; +import static org.forgerock.opendj.ldap.responses.Responses.newGenericExtendedResult; +import static org.forgerock.opendj.ldap.responses.Responses.newResult; +import static org.forgerock.opendj.ldap.spi.LdapPromises.newSuccessfulLdapPromise; +import static org.forgerock.util.Options.defaultOptions; +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.eq; +import static org.mockito.Matchers.isNotNull; +import static org.mockito.Matchers.isNull; +import static org.mockito.Matchers.same; +import static org.mockito.Mockito.*; +import static org.mockito.MockitoAnnotations.initMocks; + +import java.util.ArrayList; +import java.util.logging.Level; + +import org.forgerock.opendj.ldap.requests.AbandonRequest; +import org.forgerock.opendj.ldap.requests.AddRequest; +import org.forgerock.opendj.ldap.requests.BindRequest; +import org.forgerock.opendj.ldap.requests.CompareRequest; +import org.forgerock.opendj.ldap.requests.DeleteRequest; +import org.forgerock.opendj.ldap.requests.ExtendedRequest; +import org.forgerock.opendj.ldap.requests.GenericExtendedRequest; +import org.forgerock.opendj.ldap.requests.ModifyDNRequest; +import org.forgerock.opendj.ldap.requests.ModifyRequest; +import org.forgerock.opendj.ldap.requests.Request; +import org.forgerock.opendj.ldap.requests.SearchRequest; +import org.forgerock.util.Function; +import org.forgerock.util.promise.NeverThrowsException; +import org.forgerock.util.promise.Promises; +import org.mockito.Mock; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +@SuppressWarnings("javadoc") +public class RequestLoadBalancerTestCase extends SdkTestCase { + @Test + public void closeLoadBalancerShouldCloseDelegateFactories() throws Exception { + configureAllFactoriesOnline(); + loadBalancer.close(); + verify(factory1).close(); + verify(factory2).close(); + verify(factory3).close(); + } + + @Test + public void getConnectionShouldNotInvokeDelegateFactory() throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnection()) { + assertThat(connection).isNotNull(); + verifyZeroInteractions(factory1, factory2, factory3); + } + verifyZeroInteractions(factory1, factory2, factory3); + loadBalancer.close(); + } + + @Test + public void getConnectionReturnANewConnectionEachTime() throws Exception { + configureAllFactoriesOnline(); + try (Connection connection1 = loadBalancer.getConnection(); + Connection connection2 = loadBalancer.getConnection()) { + assertThat(connection1).isNotSameAs(connection2); + } + loadBalancer.close(); + } + + @Test + public void getConnectionAsyncReturnANewConnectionEachTime() throws Exception { + configureAllFactoriesOnline(); + try (Connection connection1 = loadBalancer.getConnectionAsync().get(); + Connection connection2 = loadBalancer.getConnectionAsync().get()) { + assertThat(connection1).isNotSameAs(connection2); + } + loadBalancer.close(); + } + + @Test + public void getConnectionAsyncShouldNotInvokeDelegateFactory() throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + assertThat(connection).isNotNull(); + verifyZeroInteractions(factory1, factory2, factory3); + } + verifyZeroInteractions(factory1, factory2, factory3); + } + + @Test + public void connectionEventListenersNotifiedOnClose() throws Exception { + configureAllFactoriesOnline(); + final ConnectionEventListener listener = mock(ConnectionEventListener.class); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.addConnectionEventListener(listener); + } + verify(listener).handleConnectionClosed(); + } + + @Test + public void connectionEventListenersNotifiedOnError() throws Exception { + configureAllFactoriesOffline(); + final ConnectionEventListener listener = mock(ConnectionEventListener.class); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.addConnectionEventListener(listener); + try { + connection.add(addRequest1); + fail("add unexpectedly succeeded"); + } catch (LdapException ignored) { + // Ignore. + } + } + verify(listener).handleConnectionError(eq(false), any(LdapException.class)); + verify(listener).handleConnectionClosed(); + } + + @Test + public void removedConnectionEventListenersShouldNotBeNotified() throws Exception { + configureAllFactoriesOnline(); + final ConnectionEventListener listener = mock(ConnectionEventListener.class); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.addConnectionEventListener(listener); + connection.removeConnectionEventListener(listener); + } + verifyZeroInteractions(listener); + } + + @Test + public void validAndClosedStateShouldBeMaintained() throws Exception { + configureAllFactoriesOffline(); + final Connection connection = loadBalancer.getConnectionAsync().get(); + assertThat(connection.isValid()).isTrue(); + assertThat(connection.isClosed()).isFalse(); + + try { + connection.add(addRequest1); + fail("add unexpectedly succeeded"); + } catch (LdapException ignored) { + // Ignore. + } + assertThat(connection.isValid()).isFalse(); + assertThat(connection.isClosed()).isFalse(); + + connection.close(); + assertThat(connection.isValid()).isFalse(); + assertThat(connection.isClosed()).isTrue(); + } + + @Test + public void factoryToStringShouldReturnANonEmptyString() throws Exception { + configureAllFactoriesOffline(); + assertThat(loadBalancer.toString()).isNotEmpty(); + } + + @Test + public void connectionToStringShouldReturnANonEmptyString() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + assertThat(connection.toString()).isNotEmpty(); + } + } + + @Test + public void abandonRequestShouldBeIgnored() throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.abandonAsync(mock(AbandonRequest.class)); + } + verifyZeroInteractions(factory1, factory2, factory3); + } + + // We can't use a DataProviders here because the mocks will be re-initialized for each test method call. + + // ################## Add Requests #################### + + @Test + public void addRequestsShouldBeRoutedCorrectly1() throws Exception { + addRequestsShouldBeRoutedCorrectlyImpl(addRequest1, factory1, connection1); + } + + @Test + public void addRequestsShouldBeRoutedCorrectly2() throws Exception { + addRequestsShouldBeRoutedCorrectlyImpl(addRequest2, factory2, connection2); + } + + @Test + public void addRequestsShouldBeRoutedCorrectly3() throws Exception { + addRequestsShouldBeRoutedCorrectlyImpl(addRequest3, factory3, connection3); + } + + private void addRequestsShouldBeRoutedCorrectlyImpl(final AddRequest addRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.add(addRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).addAsync(same(addRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void addRequestsShouldLinearProbeOnFailure1() throws Exception { + addRequestsShouldLinearProbeOnFailureImpl(addRequest1); + } + + @Test + public void addRequestsShouldLinearProbeOnFailure2() throws Exception { + addRequestsShouldLinearProbeOnFailureImpl(addRequest2); + } + + @Test + public void addRequestsShouldLinearProbeOnFailure3() throws Exception { + addRequestsShouldLinearProbeOnFailureImpl(addRequest3); + } + + private void addRequestsShouldLinearProbeOnFailureImpl(final AddRequest addRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.add(addRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).addAsync(same(addRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void addRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.add(addRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Bind Requests #################### + + @Test + public void bindRequestsShouldBeRoutedCorrectly1() throws Exception { + bindRequestsShouldBeRoutedCorrectlyImpl(bindRequest1, factory1, connection1); + } + + @Test + public void bindRequestsShouldBeRoutedCorrectly2() throws Exception { + bindRequestsShouldBeRoutedCorrectlyImpl(bindRequest2, factory2, connection2); + } + + @Test + public void bindRequestsShouldBeRoutedCorrectly3() throws Exception { + bindRequestsShouldBeRoutedCorrectlyImpl(bindRequest3, factory3, connection3); + } + + private void bindRequestsShouldBeRoutedCorrectlyImpl(final BindRequest bindRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.bind(bindRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).bindAsync(same(bindRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void bindRequestsShouldLinearProbeOnFailure1() throws Exception { + bindRequestsShouldLinearProbeOnFailureImpl(bindRequest1); + } + + @Test + public void bindRequestsShouldLinearProbeOnFailure2() throws Exception { + bindRequestsShouldLinearProbeOnFailureImpl(bindRequest2); + } + + @Test + public void bindRequestsShouldLinearProbeOnFailure3() throws Exception { + bindRequestsShouldLinearProbeOnFailureImpl(bindRequest3); + } + + private void bindRequestsShouldLinearProbeOnFailureImpl(final BindRequest bindRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.bind(bindRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).bindAsync(same(bindRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void bindRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.bind(bindRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Compare Requests #################### + + @Test + public void compareRequestsShouldBeRoutedCorrectly1() throws Exception { + compareRequestsShouldBeRoutedCorrectlyImpl(compareRequest1, factory1, connection1); + } + + @Test + public void compareRequestsShouldBeRoutedCorrectly2() throws Exception { + compareRequestsShouldBeRoutedCorrectlyImpl(compareRequest2, factory2, connection2); + } + + @Test + public void compareRequestsShouldBeRoutedCorrectly3() throws Exception { + compareRequestsShouldBeRoutedCorrectlyImpl(compareRequest3, factory3, connection3); + } + + private void compareRequestsShouldBeRoutedCorrectlyImpl(final CompareRequest compareRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.compare(compareRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).compareAsync(same(compareRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void compareRequestsShouldLinearProbeOnFailure1() throws Exception { + compareRequestsShouldLinearProbeOnFailureImpl(compareRequest1); + } + + @Test + public void compareRequestsShouldLinearProbeOnFailure2() throws Exception { + compareRequestsShouldLinearProbeOnFailureImpl(compareRequest2); + } + + @Test + public void compareRequestsShouldLinearProbeOnFailure3() throws Exception { + compareRequestsShouldLinearProbeOnFailureImpl(compareRequest3); + } + + private void compareRequestsShouldLinearProbeOnFailureImpl(final CompareRequest compareRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.compare(compareRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).compareAsync(same(compareRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void compareRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.compare(compareRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Delete Requests #################### + + @Test + public void deleteRequestsShouldBeRoutedCorrectly1() throws Exception { + deleteRequestsShouldBeRoutedCorrectlyImpl(deleteRequest1, factory1, connection1); + } + + @Test + public void deleteRequestsShouldBeRoutedCorrectly2() throws Exception { + deleteRequestsShouldBeRoutedCorrectlyImpl(deleteRequest2, factory2, connection2); + } + + @Test + public void deleteRequestsShouldBeRoutedCorrectly3() throws Exception { + deleteRequestsShouldBeRoutedCorrectlyImpl(deleteRequest3, factory3, connection3); + } + + private void deleteRequestsShouldBeRoutedCorrectlyImpl(final DeleteRequest deleteRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.delete(deleteRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).deleteAsync(same(deleteRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void deleteRequestsShouldLinearProbeOnFailure1() throws Exception { + deleteRequestsShouldLinearProbeOnFailureImpl(deleteRequest1); + } + + @Test + public void deleteRequestsShouldLinearProbeOnFailure2() throws Exception { + deleteRequestsShouldLinearProbeOnFailureImpl(deleteRequest2); + } + + @Test + public void deleteRequestsShouldLinearProbeOnFailure3() throws Exception { + deleteRequestsShouldLinearProbeOnFailureImpl(deleteRequest3); + } + + private void deleteRequestsShouldLinearProbeOnFailureImpl(final DeleteRequest deleteRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.delete(deleteRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).deleteAsync(same(deleteRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void deleteRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.delete(deleteRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Extended Requests #################### + + @Test + public void extendedRequestsShouldBeRoutedCorrectly1() throws Exception { + extendedRequestsShouldBeRoutedCorrectlyImpl(extendedRequest1, factory1, connection1); + } + + @Test + public void extendedRequestsShouldBeRoutedCorrectly2() throws Exception { + extendedRequestsShouldBeRoutedCorrectlyImpl(extendedRequest2, factory2, connection2); + } + + @Test + public void extendedRequestsShouldBeRoutedCorrectly3() throws Exception { + extendedRequestsShouldBeRoutedCorrectlyImpl(extendedRequest3, factory3, connection3); + } + + private void extendedRequestsShouldBeRoutedCorrectlyImpl(final ExtendedRequest extendedRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.extendedRequest(extendedRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).extendedRequestAsync(same(extendedRequest), + isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void extendedRequestsShouldLinearProbeOnFailure1() throws Exception { + extendedRequestsShouldLinearProbeOnFailureImpl(extendedRequest1); + } + + @Test + public void extendedRequestsShouldLinearProbeOnFailure2() throws Exception { + extendedRequestsShouldLinearProbeOnFailureImpl(extendedRequest2); + } + + @Test + public void extendedRequestsShouldLinearProbeOnFailure3() throws Exception { + extendedRequestsShouldLinearProbeOnFailureImpl(extendedRequest3); + } + + private void extendedRequestsShouldLinearProbeOnFailureImpl( + final ExtendedRequest extendedRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.extendedRequest(extendedRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).extendedRequestAsync(same(extendedRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void extendedRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.extendedRequest(extendedRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Modify Requests #################### + + @Test + public void modifyRequestsShouldBeRoutedCorrectly1() throws Exception { + modifyRequestsShouldBeRoutedCorrectlyImpl(modifyRequest1, factory1, connection1); + } + + @Test + public void modifyRequestsShouldBeRoutedCorrectly2() throws Exception { + modifyRequestsShouldBeRoutedCorrectlyImpl(modifyRequest2, factory2, connection2); + } + + @Test + public void modifyRequestsShouldBeRoutedCorrectly3() throws Exception { + modifyRequestsShouldBeRoutedCorrectlyImpl(modifyRequest3, factory3, connection3); + } + + private void modifyRequestsShouldBeRoutedCorrectlyImpl(final ModifyRequest modifyRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.modify(modifyRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).modifyAsync(same(modifyRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void modifyRequestsShouldLinearProbeOnFailure1() throws Exception { + modifyRequestsShouldLinearProbeOnFailureImpl(modifyRequest1); + } + + @Test + public void modifyRequestsShouldLinearProbeOnFailure2() throws Exception { + modifyRequestsShouldLinearProbeOnFailureImpl(modifyRequest2); + } + + @Test + public void modifyRequestsShouldLinearProbeOnFailure3() throws Exception { + modifyRequestsShouldLinearProbeOnFailureImpl(modifyRequest3); + } + + private void modifyRequestsShouldLinearProbeOnFailureImpl(final ModifyRequest modifyRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.modify(modifyRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).modifyAsync(same(modifyRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void modifyRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.modify(modifyRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## ModifyDN Requests #################### + + @Test + public void modifyDNRequestsShouldBeRoutedCorrectly1() throws Exception { + modifyDNRequestsShouldBeRoutedCorrectlyImpl(modifyDNRequest1, factory1, connection1); + } + + @Test + public void modifyDNRequestsShouldBeRoutedCorrectly2() throws Exception { + modifyDNRequestsShouldBeRoutedCorrectlyImpl(modifyDNRequest2, factory2, connection2); + } + + @Test + public void modifyDNRequestsShouldBeRoutedCorrectly3() throws Exception { + modifyDNRequestsShouldBeRoutedCorrectlyImpl(modifyDNRequest3, factory3, connection3); + } + + private void modifyDNRequestsShouldBeRoutedCorrectlyImpl(final ModifyDNRequest modifyDNRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.modifyDN(modifyDNRequest); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).modifyDNAsync(same(modifyDNRequest), isNull(IntermediateResponseHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void modifyDNRequestsShouldLinearProbeOnFailure1() throws Exception { + modifyDNRequestsShouldLinearProbeOnFailureImpl(modifyDNRequest1); + } + + @Test + public void modifyDNRequestsShouldLinearProbeOnFailure2() throws Exception { + modifyDNRequestsShouldLinearProbeOnFailureImpl(modifyDNRequest2); + } + + @Test + public void modifyDNRequestsShouldLinearProbeOnFailure3() throws Exception { + modifyDNRequestsShouldLinearProbeOnFailureImpl(modifyDNRequest3); + } + + private void modifyDNRequestsShouldLinearProbeOnFailureImpl( + final ModifyDNRequest modifyDNRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.modifyDN(modifyDNRequest); + } + verify(factory3).getConnectionAsync(); + verify(connection3).modifyDNAsync(same(modifyDNRequest), isNull(IntermediateResponseHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void modifyDNRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.modifyDN(modifyDNRequest1); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + // ################## Search Requests #################### + + @Test + public void searchRequestsShouldBeRoutedCorrectly1() throws Exception { + searchRequestsShouldBeRoutedCorrectlyImpl(searchRequest1, factory1, connection1); + } + + @Test + public void searchRequestsShouldBeRoutedCorrectly2() throws Exception { + searchRequestsShouldBeRoutedCorrectlyImpl(searchRequest2, factory2, connection2); + } + + @Test + public void searchRequestsShouldBeRoutedCorrectly3() throws Exception { + searchRequestsShouldBeRoutedCorrectlyImpl(searchRequest3, factory3, connection3); + } + + private void searchRequestsShouldBeRoutedCorrectlyImpl(final SearchRequest searchRequest, + final ConnectionFactory expectedFactory, + final Connection expectedConnection) throws Exception { + configureAllFactoriesOnline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.search(searchRequest, new ArrayList<>()); + } + verify(expectedFactory).getConnectionAsync(); + verify(expectedConnection).searchAsync(same(searchRequest), + isNull(IntermediateResponseHandler.class), + isNotNull(SearchResultHandler.class)); + verify(expectedConnection).close(); + verifyZeroInteractionsForRemainingFactories(expectedFactory); + } + + @Test + public void searchRequestsShouldLinearProbeOnFailure1() throws Exception { + searchRequestsShouldLinearProbeOnFailureImpl(searchRequest1); + } + + @Test + public void searchRequestsShouldLinearProbeOnFailure2() throws Exception { + searchRequestsShouldLinearProbeOnFailureImpl(searchRequest2); + } + + @Test + public void searchRequestsShouldLinearProbeOnFailure3() throws Exception { + searchRequestsShouldLinearProbeOnFailureImpl(searchRequest3); + } + + private void searchRequestsShouldLinearProbeOnFailureImpl(final SearchRequest searchRequest) throws Exception { + configureFactoriesOneAndTwoOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + connection.search(searchRequest, new ArrayList<>()); + } + verify(factory3).getConnectionAsync(); + verify(connection3).searchAsync(same(searchRequest), + isNull(IntermediateResponseHandler.class), + isNotNull(SearchResultHandler.class)); + verify(connection3).close(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + } + + @Test + public void searchRequestsShouldFailWhenAllFactoriesOffline() throws Exception { + configureAllFactoriesOffline(); + try (Connection connection = loadBalancer.getConnectionAsync().get()) { + try { + connection.search(searchRequest1, new ArrayList<>()); + } catch (ConnectionException e) { + assertThat(e.getResult().getResultCode()).isEqualTo(CLIENT_SIDE_CONNECT_ERROR); + } + } + verify(factory1, atLeastOnce()).getConnectionAsync(); + verify(factory2, atLeastOnce()).getConnectionAsync(); + verify(factory3, atLeastOnce()).getConnectionAsync(); + verifyZeroInteractions(connection1); + verifyZeroInteractions(connection2); + verifyZeroInteractions(connection3); + } + + @Mock private ConnectionFactory factory1; + @Mock private ConnectionFactory factory2; + @Mock private ConnectionFactory factory3; + + @Mock private AbstractAsynchronousConnection connection1; + @Mock private AbstractAsynchronousConnection connection2; + @Mock private AbstractAsynchronousConnection connection3; + + @Mock private AddRequest addRequest1; + @Mock private AddRequest addRequest2; + @Mock private AddRequest addRequest3; + + @Mock private BindRequest bindRequest1; + @Mock private BindRequest bindRequest2; + @Mock private BindRequest bindRequest3; + + @Mock private CompareRequest compareRequest1; + @Mock private CompareRequest compareRequest2; + @Mock private CompareRequest compareRequest3; + + @Mock private DeleteRequest deleteRequest1; + @Mock private DeleteRequest deleteRequest2; + @Mock private DeleteRequest deleteRequest3; + + @Mock private GenericExtendedRequest extendedRequest1; + @Mock private GenericExtendedRequest extendedRequest2; + @Mock private GenericExtendedRequest extendedRequest3; + + @Mock private ModifyRequest modifyRequest1; + @Mock private ModifyRequest modifyRequest2; + @Mock private ModifyRequest modifyRequest3; + + @Mock private ModifyDNRequest modifyDNRequest1; + @Mock private ModifyDNRequest modifyDNRequest2; + @Mock private ModifyDNRequest modifyDNRequest3; + + @Mock private SearchRequest searchRequest1; + @Mock private SearchRequest searchRequest2; + @Mock private SearchRequest searchRequest3; + + private ConnectionFactory loadBalancer; + + @BeforeMethod + public void beforeMethod() { + TestCaseUtils.setDefaultLogLevel(Level.SEVERE); + initMocks(this); + stub(this.connection1); + stub(this.connection2); + stub(this.connection3); + loadBalancer = new RequestLoadBalancer("Test", + asList(factory1, factory2, factory3), + defaultOptions(), newNextFactoryFunction()); + } + + private Function newNextFactoryFunction() { + return new Function() { + @Override + public Integer apply(final Request request) { + if (request == addRequest1 || request == bindRequest1 || request == compareRequest1 + || request == deleteRequest1 || request == extendedRequest1 || request == modifyRequest1 + || request == modifyDNRequest1 || request == searchRequest1) { + return 0; + } + + if (request == addRequest2 || request == bindRequest2 || request == compareRequest2 + || request == deleteRequest2 || request == extendedRequest2 || request == modifyRequest2 + || request == modifyDNRequest2 || request == searchRequest2) { + return 1; + } + + if (request == addRequest3 || request == bindRequest3 || request == compareRequest3 + || request == deleteRequest3 || request == extendedRequest3 || request == modifyRequest3 + || request == modifyDNRequest3 || request == searchRequest3) { + return 2; + } + + fail("Received unexpected request"); + return -1; // Keep compiler happy. + } + }; + } + + private void stub(final Connection connection) { + when(connection.addAsync(any(AddRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newResult(ResultCode.SUCCESS))); + when(connection.bindAsync(any(BindRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newBindResult(ResultCode.SUCCESS))); + when(connection.compareAsync(any(CompareRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newCompareResult(ResultCode.SUCCESS))); + when(connection.deleteAsync(any(DeleteRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newResult(ResultCode.SUCCESS))); + when(connection.extendedRequestAsync(any(GenericExtendedRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newGenericExtendedResult(ResultCode.SUCCESS))); + when(connection.modifyAsync(any(ModifyRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newResult(ResultCode.SUCCESS))); + when(connection.modifyDNAsync(any(ModifyDNRequest.class), any(IntermediateResponseHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newResult(ResultCode.SUCCESS))); + when(connection.searchAsync(any(SearchRequest.class), any(IntermediateResponseHandler.class), + any(SearchResultHandler.class))) + .thenReturn(newSuccessfulLdapPromise(newResult(ResultCode.SUCCESS))); + } + + @AfterMethod + public void afterMethod() { + loadBalancer.close(); + TestCaseUtils.setDefaultLogLevel(Level.INFO); + } + + private void configureAllFactoriesOnline() { + when(factory1.getConnectionAsync()) + .thenReturn(Promises.newResultPromise(connection1)); + when(factory2.getConnectionAsync()) + .thenReturn(Promises.newResultPromise(connection2)); + when(factory3.getConnectionAsync()) + .thenReturn(Promises.newResultPromise(connection3)); + } + + private void configureFactoriesOneAndTwoOffline() { + final LdapException connectionFailure = newLdapException(CLIENT_SIDE_CONNECT_ERROR); + when(factory1.getConnectionAsync()) + .thenReturn(Promises.newExceptionPromise(connectionFailure)); + when(factory2.getConnectionAsync()) + .thenReturn(Promises.newExceptionPromise(connectionFailure)); + when(factory3.getConnectionAsync()) + .thenReturn(Promises.newResultPromise(connection3)); + } + + private void configureAllFactoriesOffline() { + final LdapException connectionFailure = newLdapException(CLIENT_SIDE_CONNECT_ERROR); + when(factory1.getConnectionAsync()) + .thenReturn(Promises.newExceptionPromise(connectionFailure)); + when(factory2.getConnectionAsync()) + .thenReturn(Promises.newExceptionPromise(connectionFailure)); + when(factory3.getConnectionAsync()) + .thenReturn(Promises.newExceptionPromise(connectionFailure)); + } + + private void verifyZeroInteractionsForRemainingFactories(final ConnectionFactory expectedFactory) { + if (expectedFactory != factory1) { + verifyZeroInteractions(factory1); + } + if (expectedFactory != factory2) { + verifyZeroInteractions(factory2); + } + if (expectedFactory != factory3) { + verifyZeroInteractions(factory3); + } + } +} diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java index 30177b614..661ef3676 100644 --- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java +++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/Proxy.java @@ -22,26 +22,27 @@ * * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.examples; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.AUTHN_BIND_REQUEST; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.HEARTBEAT_ENABLED; -import static org.forgerock.opendj.ldap.LDAPListener.*; +import static org.forgerock.opendj.ldap.LDAPListener.CONNECT_MAX_BACKLOG; import static org.forgerock.opendj.ldap.requests.Requests.newSimpleBindRequest; import java.io.IOException; +import java.util.Collection; import java.util.LinkedList; import java.util.List; import org.forgerock.opendj.ldap.ConnectionFactory; import org.forgerock.opendj.ldap.Connections; -import org.forgerock.opendj.ldap.LdapException; import org.forgerock.opendj.ldap.LDAPClientContext; import org.forgerock.opendj.ldap.LDAPConnectionFactory; import org.forgerock.opendj.ldap.LDAPListener; +import org.forgerock.opendj.ldap.LdapException; import org.forgerock.opendj.ldap.RequestContext; import org.forgerock.opendj.ldap.RequestHandlerFactory; import org.forgerock.opendj.ldap.ServerConnectionFactory; @@ -61,33 +62,44 @@ * This example takes the following command line parameters: * * 

- *     {@code      
- *      [  ...]}
+ *     {@code [--load-balancer ]    
+ *           [  ...]}
  *
+ * + * Where {@code } is one of "round-robin", "fail-over", or "sharded". The default is round-robin. */ public final class Proxy { /** * Main method. * * @param args - * The command line arguments: listen address, listen port, + * The command line arguments: [--load-balancer ] listen address, listen port, * remote address1, remote port1, remote address2, remote port2, * ... */ public static void main(final String[] args) { if (args.length < 6 || args.length % 2 != 0) { - System.err.println("Usage: listenAddress listenPort " - + "proxyDN proxyPassword remoteAddress1 remotePort1 " - + "remoteAddress2 remotePort2 ..."); + System.err.println("Usage: [--load-balancer ] listenAddress listenPort " + + "proxyDN proxyPassword remoteAddress1 remotePort1 remoteAddress2 remotePort2 ..."); System.exit(1); } // Parse command line arguments. - final String localAddress = args[0]; - final int localPort = Integer.parseInt(args[1]); + int i = 0; + + final LoadBalancingAlgorithm algorithm; + if ("--load-balancer".equals(args[i])) { + algorithm = getLoadBalancingAlgorithm(args[i + 1]); + i += 2; + } else { + algorithm = LoadBalancingAlgorithm.ROUND_ROBIN; + } - final String proxyDN = args[2]; - final String proxyPassword = args[3]; + final String localAddress = args[i++]; + final int localPort = Integer.parseInt(args[i++]); + + final String proxyDN = args[i++]; + final String proxyPassword = args[i++]; // Create load balancer. // --- JCite pools --- @@ -100,7 +112,7 @@ public static void main(final String[] args) { final List bindFactories = new LinkedList<>(); final Options bindFactoryOptions = Options.defaultOptions().set(HEARTBEAT_ENABLED, true); - for (int i = 4; i < args.length; i += 2) { + for (; i < args.length; i += 2) { final String remoteAddress = args[i]; final int remotePort = Integer.parseInt(args[i + 1]); @@ -114,10 +126,8 @@ public static void main(final String[] args) { } // --- JCite pools --- - // --- JCite load balancer --- - final ConnectionFactory factory = Connections.newRoundRobinLoadBalancer(factories, factoryOptions); - final ConnectionFactory bindFactory = Connections.newRoundRobinLoadBalancer(bindFactories, bindFactoryOptions); - // --- JCite load balancer --- + final ConnectionFactory factory = algorithm.newLoadBalancer(factories, factoryOptions); + final ConnectionFactory bindFactory = algorithm.newLoadBalancer(bindFactories, bindFactoryOptions); // --- JCite backend --- /* @@ -156,6 +166,47 @@ public ProxyBackend handleAccept(LDAPClientContext clientContext) // --- JCite listener --- } + private static LoadBalancingAlgorithm getLoadBalancingAlgorithm(final String algorithmName) { + switch (algorithmName) { + case "round-robin": + return LoadBalancingAlgorithm.ROUND_ROBIN; + case "fail-over": + return LoadBalancingAlgorithm.FAIL_OVER; + case "sharded": + return LoadBalancingAlgorithm.SHARDED; + default: + System.err.println("Unrecognized load-balancing algorithm '" + algorithmName + "'. Should be one of " + + "'round-robin', 'fail-over', or 'sharded'."); + System.exit(1); + } + return LoadBalancingAlgorithm.ROUND_ROBIN; // keep compiler happy. + } + + private enum LoadBalancingAlgorithm { + ROUND_ROBIN { + @Override + ConnectionFactory newLoadBalancer(final Collection factories, final Options options) { + // --- JCite load balancer --- + return Connections.newRoundRobinLoadBalancer(factories, options); + // --- JCite load balancer --- + } + }, + FAIL_OVER { + @Override + ConnectionFactory newLoadBalancer(final Collection factories, final Options options) { + return Connections.newFailoverLoadBalancer(factories, options); + } + }, + SHARDED { + @Override + ConnectionFactory newLoadBalancer(final Collection factories, final Options options) { + return Connections.newShardedRequestLoadBalancer(factories, options); + } + }; + + abstract ConnectionFactory newLoadBalancer(Collection factories, Options options); + } + private Proxy() { // Not used. } From f5baa1a79b276e5ef8f4817ac18cce361975ab6c Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 17 Feb 2016 15:13:23 +0100 Subject: [PATCH 056/125] OPENDJSDK-86 - Replace README with Markdown README.md --- README | 15 ------ README.md | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+), 15 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 0deff651f..000000000 --- a/README +++ /dev/null @@ -1,15 +0,0 @@ -OpenDJ Ldap SDK - -This Maven project contains the OpenDJ Ldap Software Development Kit, -All modules are 100% Java based and require Java 7. - -OpenDJ is a downstream build of the OpenDS project, with a different name -to avoid trademark issues. - -Complete documentation for this product may be found online -at http://www.forgerock.com/opendj.html. - -This product is made available under the Common Development and Distribution -License (CDDL). The complete text for this license, and for alternate licenses -of included components, may be found in the legal-notices directory. - diff --git a/README.md b/README.md new file mode 100644 index 000000000..2c0897b7b --- /dev/null +++ b/README.md @@ -0,0 +1,147 @@ + + +OpenDJ SDK +========== + +The **OpenDJ LDAP SDK** provides a set of modern, developer-friendly Java APIs as part of the +[OpenDJ](http://opendj.forgerock.org) product suite, which is actively maintained and supported by +[ForgeRock](http://www.forgerock.com). The product suite includes the client SDK alongside command-line tools and +sample code, a 100% pure Java directory server, and more. You can use **OpenDJ SDK** to create client applications +for use with any server that complies with the +[RFC 4510: LDAP - Technical Specification Road Map](http://tools.ietf.org/html/rfc4510). + +The **OpenDJ LDAP SDK** brings you easy-to-use connection management, connection pooling, load balancing, and all the +standard LDAP operations to read and write directory entries. **OpenDJ LDAP SDK** also lets you build applications with +capabilities defined in additional draft and experimental RFCs that are supported by modern LDAP servers. + +Documentation +============= + +Javadoc for this module can be found [here](http://opendj.forgerock.org/opendj-core/apidocs/index.html). Read the +[developer guide](http://opendj.forgerock.org/doc/dev-guide/index.html) for a deeper understanding of LDAP application +development, as well as a detailed overview of LDAP itself. + +Get the OpenDJ LDAP SDK +======================= + +You can start developing your LDAP applications now by obtaining the **OpenDJ LDAP SDK** using any of the following +methods: + +Maven +----- + +By far the simplest method is to develop your application using Maven and add the following settings to your pom.xml: + +```xml + + + forgerock-staging-repository + ForgeRock Release Repository + http://maven.forgerock.org/repo/releases + + false + + + + forgerock-snapshots-repository + ForgeRock Snapshot Repository + http://maven.forgerock.org/repo/snapshots + + false + + + +``` + +The following dependencies will load both the [OpenDJ Core APIs](opendj-core) and the [OpenDJ Grizzly](opendj-grizzly) +network transport. Remember to override the version according to your needs: + +```xml + + + org.forgerock.opendj + opendj-core + 3.0.0 + + + org.forgerock.opendj + opendj-grizzly + 3.0.0 + + +``` + +In some use-cases, such as developing LDAP unit tests or embedded LDAP applications, the network transport is not +required, in which case you can simply declare a dependency on the OpenDJ core APIs: + +```xml + + + org.forgerock.opendj + opendj-core + 3.0.0 + + +``` + +Build it yourself +----------------- + +You need `git` and `maven` in order to get the source code and build it: + +```bash +git clone ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git +cd opendj-sdk +mvn clean install +``` + +Getting started +=============== + +The following example shows how the **OpenDJ LDAP SDK** may be used to connect to a Directory Server, authenticate, and +then perform a search. The search results are output as LDIF to the standard output: + +```java +// Create an LDIF writer which will write the search results to stdout. +final LDIFEntryWriter writer = new LDIFEntryWriter(System.out); + +// Connect and bind to the server. +final LDAPConnectionFactory factory = new LDAPConnectionFactory(hostName, port); +final Connection connection = factory.getConnection(); +connection.bind(userName, password.toCharArray()); + +// Read the entries and output them as LDIF. +final ConnectionEntryReader reader = connection.search(baseDN, scope, filter, attributes); +while (reader.hasNext()) { + if (!reader.isReference()) { + final SearchResultEntry entry = reader.readEntry(); + writer.writeComment("Search result entry: " + entry.getName()); + writer.writeEntry(entry); + } else { + final SearchResultReference ref = reader.readReference(); + writer.writeComment("Search result reference: " + ref.getURIs()); + } +} +writer.flush(); +connection.close(); +``` + +License +======= + +**OpenDJ LDAP SDK** is licensed under [CDDL 1.0](legal-notices/CDDLv1_0.txt) (COMMON DEVELOPMENT AND DISTRIBUTION +LICENSE Version 1.0) From 908a4d8d50aed67d32921ed6b69260fcd03e2cda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 22 Feb 2016 17:23:29 +0100 Subject: [PATCH 057/125] Removed unused imports --- .../java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java | 4 +++- .../forgerock/opendj/maven/doc/GenerateMessageFileMojo.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java index d7e6ec64d..24c8dda73 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java @@ -28,7 +28,9 @@ import static java.util.Arrays.asList; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; -import static org.forgerock.opendj.ldap.Connections.*; +import static org.forgerock.opendj.ldap.Connections.LOAD_BALANCER_EVENT_LISTENER; +import static org.forgerock.opendj.ldap.Connections.LOAD_BALANCER_MONITORING_INTERVAL; +import static org.forgerock.opendj.ldap.Connections.LOAD_BALANCER_SCHEDULER; import static org.forgerock.opendj.ldap.Connections.newRoundRobinLoadBalancer; import static org.forgerock.opendj.ldap.LdapException.newLdapException; import static org.forgerock.util.Options.defaultOptions; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java index 553316324..95f65069b 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java @@ -28,7 +28,6 @@ import static org.apache.maven.plugins.annotations.LifecyclePhase.*; import static org.forgerock.opendj.maven.doc.DocsMessages.*; -import static org.forgerock.util.Utils.*; import java.io.File; import java.io.FileInputStream; From 616001372c6054718f3bd0151a040a5149029d2b Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 23 Feb 2016 16:12:49 +0100 Subject: [PATCH 058/125] OPENDJ-2689 Update copyright headers * Align the copyright headers with the rest of ForgeRock source code. * Ensure that we always use "ForgeRock AS." * org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java * Change generated copyright * Code cleanup --- opendj-cli/pom.xml | 36 +-- .../opendj/cli/ApplicationKeyManager.java | 34 +-- .../com/forgerock/opendj/cli/Argument.java | 32 +- .../opendj/cli/ArgumentConstants.java | 30 +- .../opendj/cli/ArgumentException.java | 32 +- .../forgerock/opendj/cli/ArgumentGroup.java | 32 +- .../forgerock/opendj/cli/ArgumentParser.java | 32 +- .../forgerock/opendj/cli/BooleanArgument.java | 32 +- .../forgerock/opendj/cli/CliConstants.java | 32 +- .../forgerock/opendj/cli/ClientException.java | 32 +- .../forgerock/opendj/cli/CommandBuilder.java | 32 +- .../forgerock/opendj/cli/CommonArguments.java | 30 +- .../opendj/cli/ConnectionFactoryProvider.java | 32 +- .../opendj/cli/ConsoleApplication.java | 34 +-- .../opendj/cli/DocDescriptionSupplement.java | 30 +- .../opendj/cli/DocGenerationHelper.java | 30 +- .../opendj/cli/FileBasedArgument.java | 32 +- .../forgerock/opendj/cli/HelpCallback.java | 32 +- .../forgerock/opendj/cli/IntegerArgument.java | 32 +- .../java/com/forgerock/opendj/cli/Menu.java | 32 +- .../com/forgerock/opendj/cli/MenuBuilder.java | 32 +- .../forgerock/opendj/cli/MenuCallback.java | 32 +- .../com/forgerock/opendj/cli/MenuResult.java | 32 +- .../opendj/cli/MultiChoiceArgument.java | 32 +- .../opendj/cli/MultiColumnPrinter.java | 32 +- .../opendj/cli/PromptingTrustManager.java | 32 +- .../com/forgerock/opendj/cli/ReturnCode.java | 29 +- .../forgerock/opendj/cli/StringArgument.java | 32 +- .../com/forgerock/opendj/cli/SubCommand.java | 32 +- .../opendj/cli/SubCommandArgumentParser.java | 32 +- .../opendj/cli/SubCommandUsageHandler.java | 30 +- .../opendj/cli/TabSeparatedTablePrinter.java | 32 +- .../forgerock/opendj/cli/TableBuilder.java | 32 +- .../forgerock/opendj/cli/TablePrinter.java | 32 +- .../forgerock/opendj/cli/TableSerializer.java | 32 +- .../opendj/cli/TextTablePrinter.java | 32 +- .../opendj/cli/ToolRefDocContainer.java | 30 +- .../java/com/forgerock/opendj/cli/Utils.java | 32 +- .../opendj/cli/ValidationCallback.java | 32 +- .../forgerock/opendj/cli/VersionHandler.java | 30 +- .../forgerock/opendj/cli/package-info.java | 30 +- .../com/forgerock/opendj/cli/cli.properties | 32 +- .../resources/templates/dscfgAppendProps.ftl | 31 +- .../resources/templates/dscfgListItem.ftl | 31 +- .../resources/templates/dscfgListSubtypes.ftl | 31 +- .../resources/templates/dscfgReference.ftl | 31 +- .../resources/templates/dscfgSubcommand.ftl | 36 +-- .../resources/templates/dscfgVarListEntry.ftl | 31 +- .../resources/templates/dscfgVariableList.ftl | 31 +- .../resources/templates/optionsRefSect1.ftl | 31 +- .../src/main/resources/templates/refEntry.ftl | 67 ++-- .../src/main/resources/templates/refSect1.ftl | 31 +- .../src/main/resources/templates/refSect2.ftl | 31 +- .../com/forgerock/opendj/cli/CliTestCase.java | 30 +- .../cli/ConsoleApplicationTestCase.java | 30 +- .../TestSubCommandArgumentParserTestCase.java | 32 +- .../opendj/cli/TestSubCommandTestCase.java | 32 +- .../forgerock/opendj/cli/UtilsTestCase.java | 30 +- opendj-copyright-maven-plugin/pom.xml | 36 +-- .../forgerock/maven/CheckCopyrightMojo.java | 30 +- .../maven/CopyrightAbstractMojo.java | 30 +- .../forgerock/maven/UpdateCopyrightMojo.java | 29 +- .../org/forgerock/maven/package-info.java | 30 +- .../maven/UpdateCopyrightTestCase.java | 30 +- .../opendj-bad-copyright-4.txt | 30 +- opendj-core/clirr-ignored-api-changes.xml | 35 +-- opendj-core/pom.xml | 35 +-- .../AccountUsabilityRequestControl.java | 32 +- .../AccountUsabilityResponseControl.java | 32 +- .../RealAttributesOnlyRequestControl.java | 32 +- .../ldap/controls/TransactionIdControl.java | 30 +- .../VirtualAttributesOnlyRequestControl.java | 32 +- .../opendj/ldap/controls/package-info.java | 30 +- .../GetConnectionIDExtendedRequest.java | 32 +- .../GetConnectionIDExtendedResult.java | 32 +- .../GetSymmetricKeyExtendedRequest.java | 32 +- .../PasswordPolicyStateExtendedRequest.java | 32 +- .../PasswordPolicyStateExtendedResult.java | 32 +- .../PasswordPolicyStateOperation.java | 30 +- ...PasswordPolicyStateOperationContainer.java | 30 +- .../PasswordPolicyStateOperationType.java | 32 +- .../opendj/ldap/extensions/package-info.java | 30 +- .../forgerock/opendj/util/ASCIICharProp.java | 32 +- .../forgerock/opendj/util/Collections2.java | 32 +- .../com/forgerock/opendj/util/Iterables.java | 32 +- .../com/forgerock/opendj/util/Iterators.java | 32 +- .../opendj/util/OperatingSystem.java | 32 +- .../com/forgerock/opendj/util/PackedLong.java | 29 +- .../com/forgerock/opendj/util/Predicate.java | 30 +- .../opendj/util/ReferenceCountedObject.java | 29 +- .../opendj/util/SizeLimitInputStream.java | 30 +- .../forgerock/opendj/util/StaticUtils.java | 32 +- .../opendj/util/StringPrepProfile.java | 32 +- .../opendj/util/SubstringReader.java | 32 +- .../forgerock/opendj/util/package-info.java | 30 +- .../java/org/forgerock/opendj/io/ASN1.java | 32 +- .../opendj/io/ASN1ByteSequenceReader.java | 32 +- .../opendj/io/ASN1InputStreamReader.java | 32 +- .../opendj/io/ASN1OutputStreamWriter.java | 32 +- .../org/forgerock/opendj/io/ASN1Reader.java | 34 +-- .../org/forgerock/opendj/io/ASN1Writer.java | 32 +- .../opendj/io/AbstractASN1Reader.java | 34 +-- .../opendj/io/AbstractASN1Writer.java | 32 +- .../opendj/io/AbstractLDAPMessageHandler.java | 32 +- .../java/org/forgerock/opendj/io/LDAP.java | 30 +- .../opendj/io/LDAPMessageHandler.java | 32 +- .../org/forgerock/opendj/io/LDAPReader.java | 32 +- .../org/forgerock/opendj/io/LDAPWriter.java | 32 +- .../org/forgerock/opendj/io/package-info.java | 30 +- .../java/org/forgerock/opendj/ldap/AVA.java | 32 +- .../ldap/AbstractAsynchronousConnection.java | 32 +- .../opendj/ldap/AbstractAttribute.java | 32 +- .../opendj/ldap/AbstractConnection.java | 32 +- .../ldap/AbstractConnectionWrapper.java | 32 +- .../forgerock/opendj/ldap/AbstractEntry.java | 32 +- .../opendj/ldap/AbstractFilterVisitor.java | 32 +- .../opendj/ldap/AbstractMapEntry.java | 32 +- .../ldap/AbstractSynchronousConnection.java | 30 +- .../forgerock/opendj/ldap/AddressMask.java | 32 +- .../org/forgerock/opendj/ldap/Assertion.java | 32 +- .../ldap/AssertionFailureException.java | 32 +- .../org/forgerock/opendj/ldap/Attribute.java | 32 +- .../opendj/ldap/AttributeDescription.java | 32 +- .../opendj/ldap/AttributeFactory.java | 32 +- .../opendj/ldap/AttributeFilter.java | 30 +- .../opendj/ldap/AttributeParser.java | 30 +- .../org/forgerock/opendj/ldap/Attributes.java | 32 +- .../opendj/ldap/AuthenticationException.java | 32 +- .../opendj/ldap/AuthorizationException.java | 32 +- .../org/forgerock/opendj/ldap/Base64.java | 32 +- .../forgerock/opendj/ldap/ByteSequence.java | 32 +- .../opendj/ldap/ByteSequenceReader.java | 32 +- .../org/forgerock/opendj/ldap/ByteString.java | 32 +- .../opendj/ldap/ByteStringBuilder.java | 32 +- .../opendj/ldap/CachedConnectionPool.java | 32 +- .../opendj/ldap/CancelRequestListener.java | 30 +- .../opendj/ldap/CancelledResultException.java | 32 +- .../opendj/ldap/CommonLDAPOptions.java | 29 +- .../opendj/ldap/ConditionResult.java | 30 +- .../org/forgerock/opendj/ldap/Connection.java | 32 +- .../opendj/ldap/ConnectionEventListener.java | 32 +- .../opendj/ldap/ConnectionException.java | 32 +- .../opendj/ldap/ConnectionFactory.java | 32 +- .../opendj/ldap/ConnectionLoadBalancer.java | 29 +- .../forgerock/opendj/ldap/ConnectionPool.java | 30 +- .../opendj/ldap/ConnectionSecurityLayer.java | 32 +- .../forgerock/opendj/ldap/Connections.java | 32 +- .../ldap/ConstraintViolationException.java | 32 +- .../java/org/forgerock/opendj/ldap/DN.java | 32 +- .../opendj/ldap/DecodeException.java | 32 +- .../forgerock/opendj/ldap/DecodeOptions.java | 32 +- .../opendj/ldap/DereferenceAliasesPolicy.java | 30 +- .../org/forgerock/opendj/ldap/Entries.java | 32 +- .../java/org/forgerock/opendj/ldap/Entry.java | 32 +- .../forgerock/opendj/ldap/EntryFactory.java | 32 +- .../opendj/ldap/EntryNotFoundException.java | 32 +- .../org/forgerock/opendj/ldap/Filter.java | 32 +- .../forgerock/opendj/ldap/FilterVisitor.java | 30 +- .../org/forgerock/opendj/ldap/Functions.java | 32 +- .../org/forgerock/opendj/ldap/GSERParser.java | 30 +- .../opendj/ldap/GeneralizedTime.java | 30 +- .../ldap/IntermediateResponseHandler.java | 32 +- .../opendj/ldap/InternalConnection.java | 32 +- .../ldap/InternalConnectionFactory.java | 32 +- .../forgerock/opendj/ldap/KeyManagers.java | 32 +- .../opendj/ldap/LDAPClientContext.java | 32 +- .../opendj/ldap/LDAPConnectionFactory.java | 32 +- .../forgerock/opendj/ldap/LDAPListener.java | 32 +- .../org/forgerock/opendj/ldap/LDAPUrl.java | 32 +- .../forgerock/opendj/ldap/LdapException.java | 32 +- .../forgerock/opendj/ldap/LdapPromise.java | 32 +- .../opendj/ldap/LdapResultHandler.java | 32 +- .../opendj/ldap/LinkedAttribute.java | 32 +- .../opendj/ldap/LinkedHashMapEntry.java | 32 +- .../forgerock/opendj/ldap/LoadBalancer.java | 32 +- .../ldap/LoadBalancerEventListener.java | 29 +- .../org/forgerock/opendj/ldap/Matcher.java | 32 +- .../forgerock/opendj/ldap/MemoryBackend.java | 29 +- .../forgerock/opendj/ldap/Modification.java | 30 +- .../opendj/ldap/ModificationType.java | 30 +- .../ldap/MultipleEntriesFoundException.java | 32 +- .../ldap/ProviderNotFoundException.java | 30 +- .../java/org/forgerock/opendj/ldap/RDN.java | 32 +- .../opendj/ldap/ReferralException.java | 30 +- .../forgerock/opendj/ldap/RequestContext.java | 30 +- .../forgerock/opendj/ldap/RequestHandler.java | 32 +- .../opendj/ldap/RequestHandlerFactory.java | 30 +- .../ldap/RequestHandlerFactoryAdapter.java | 30 +- .../opendj/ldap/RequestLoadBalancer.java | 29 +- .../org/forgerock/opendj/ldap/ResultCode.java | 32 +- .../org/forgerock/opendj/ldap/RootDSE.java | 32 +- .../opendj/ldap/SSLContextBuilder.java | 32 +- .../forgerock/opendj/ldap/SchemaResolver.java | 32 +- .../opendj/ldap/SearchResultHandler.java | 32 +- .../SearchResultReferenceIOException.java | 32 +- .../forgerock/opendj/ldap/SearchScope.java | 32 +- .../opendj/ldap/ServerConnection.java | 32 +- .../opendj/ldap/ServerConnectionFactory.java | 32 +- .../org/forgerock/opendj/ldap/SortKey.java | 32 +- .../forgerock/opendj/ldap/TimeoutChecker.java | 32 +- .../opendj/ldap/TimeoutEventListener.java | 29 +- .../opendj/ldap/TimeoutResultException.java | 32 +- .../forgerock/opendj/ldap/TreeMapEntry.java | 32 +- .../forgerock/opendj/ldap/TrustManagers.java | 32 +- .../ADNotificationRequestControl.java | 29 +- .../controls/AssertionRequestControl.java | 32 +- .../AuthorizationIdentityRequestControl.java | 32 +- .../AuthorizationIdentityResponseControl.java | 32 +- .../opendj/ldap/controls/Control.java | 30 +- .../opendj/ldap/controls/ControlDecoder.java | 30 +- ...ntryChangeNotificationResponseControl.java | 32 +- .../opendj/ldap/controls/GenericControl.java | 32 +- .../GetEffectiveRightsRequestControl.java | 32 +- .../controls/ManageDsaITRequestControl.java | 32 +- .../controls/MatchedValuesRequestControl.java | 32 +- .../PasswordExpiredResponseControl.java | 32 +- .../PasswordExpiringResponseControl.java | 32 +- .../controls/PasswordPolicyErrorType.java | 30 +- .../PasswordPolicyRequestControl.java | 32 +- .../PasswordPolicyResponseControl.java | 32 +- .../controls/PasswordPolicyWarningType.java | 30 +- .../PermissiveModifyRequestControl.java | 32 +- .../controls/PersistentSearchChangeType.java | 32 +- .../PersistentSearchRequestControl.java | 32 +- .../ldap/controls/PostReadRequestControl.java | 32 +- .../controls/PostReadResponseControl.java | 32 +- .../ldap/controls/PreReadRequestControl.java | 32 +- .../ldap/controls/PreReadResponseControl.java | 32 +- .../controls/ProxiedAuthV1RequestControl.java | 32 +- .../controls/ProxiedAuthV2RequestControl.java | 32 +- .../ServerSideSortRequestControl.java | 32 +- .../ServerSideSortResponseControl.java | 32 +- .../controls/SimplePagedResultsControl.java | 32 +- .../controls/SubentriesRequestControl.java | 32 +- .../controls/SubtreeDeleteRequestControl.java | 32 +- .../VirtualListViewRequestControl.java | 32 +- .../VirtualListViewResponseControl.java | 32 +- .../opendj/ldap/controls/package-info.java | 30 +- .../forgerock/opendj/ldap/package-info.java | 30 +- .../opendj/ldap/requests/AbandonRequest.java | 32 +- .../ldap/requests/AbandonRequestImpl.java | 32 +- .../ldap/requests/AbstractBindRequest.java | 30 +- .../requests/AbstractExtendedRequest.java | 32 +- .../ldap/requests/AbstractRequestImpl.java | 32 +- .../requests/AbstractSASLBindRequest.java | 32 +- .../AbstractUnmodifiableBindRequest.java | 32 +- .../AbstractUnmodifiableExtendedRequest.java | 30 +- .../requests/AbstractUnmodifiableRequest.java | 32 +- .../AbstractUnmodifiableSASLBindRequest.java | 30 +- .../opendj/ldap/requests/AddRequest.java | 32 +- .../opendj/ldap/requests/AddRequestImpl.java | 32 +- .../requests/AnonymousSASLBindRequest.java | 32 +- .../AnonymousSASLBindRequestImpl.java | 32 +- .../opendj/ldap/requests/BindClient.java | 32 +- .../opendj/ldap/requests/BindClientImpl.java | 32 +- .../opendj/ldap/requests/BindRequest.java | 32 +- .../ldap/requests/CRAMMD5SASLBindRequest.java | 32 +- .../requests/CRAMMD5SASLBindRequestImpl.java | 32 +- .../ldap/requests/CancelExtendedRequest.java | 32 +- .../requests/CancelExtendedRequestImpl.java | 32 +- .../opendj/ldap/requests/CompareRequest.java | 32 +- .../ldap/requests/CompareRequestImpl.java | 32 +- .../opendj/ldap/requests/DeleteRequest.java | 32 +- .../ldap/requests/DeleteRequestImpl.java | 32 +- .../requests/DigestMD5SASLBindRequest.java | 32 +- .../DigestMD5SASLBindRequestImpl.java | 32 +- .../opendj/ldap/requests/ExtendedRequest.java | 30 +- .../ldap/requests/ExtendedRequestDecoder.java | 30 +- .../requests/ExternalSASLBindRequest.java | 32 +- .../requests/ExternalSASLBindRequestImpl.java | 32 +- .../ldap/requests/GSSAPISASLBindRequest.java | 32 +- .../requests/GSSAPISASLBindRequestImpl.java | 32 +- .../ldap/requests/GenericBindRequest.java | 32 +- .../ldap/requests/GenericBindRequestImpl.java | 32 +- .../ldap/requests/GenericExtendedRequest.java | 32 +- .../requests/GenericExtendedRequestImpl.java | 32 +- .../opendj/ldap/requests/ModifyDNRequest.java | 32 +- .../ldap/requests/ModifyDNRequestImpl.java | 32 +- .../opendj/ldap/requests/ModifyRequest.java | 32 +- .../ldap/requests/ModifyRequestImpl.java | 32 +- .../PasswordModifyExtendedRequest.java | 32 +- .../PasswordModifyExtendedRequestImpl.java | 32 +- .../ldap/requests/PlainSASLBindRequest.java | 32 +- .../requests/PlainSASLBindRequestImpl.java | 32 +- .../opendj/ldap/requests/Request.java | 32 +- .../opendj/ldap/requests/Requests.java | 32 +- .../ldap/requests/SASLBindClientImpl.java | 32 +- .../opendj/ldap/requests/SASLBindRequest.java | 32 +- .../opendj/ldap/requests/SearchRequest.java | 32 +- .../ldap/requests/SearchRequestImpl.java | 32 +- .../ldap/requests/SimpleBindRequest.java | 32 +- .../ldap/requests/SimpleBindRequestImpl.java | 32 +- .../requests/StartTLSExtendedRequest.java | 32 +- .../requests/StartTLSExtendedRequestImpl.java | 32 +- .../opendj/ldap/requests/UnbindRequest.java | 32 +- .../ldap/requests/UnbindRequestImpl.java | 32 +- .../UnmodifiableAbandonRequestImpl.java | 30 +- .../requests/UnmodifiableAddRequestImpl.java | 32 +- ...odifiableAnonymousSASLBindRequestImpl.java | 32 +- ...nmodifiableCRAMMD5SASLBindRequestImpl.java | 32 +- ...UnmodifiableCancelExtendedRequestImpl.java | 32 +- .../UnmodifiableCompareRequestImpl.java | 32 +- .../UnmodifiableDeleteRequestImpl.java | 32 +- ...odifiableDigestMD5SASLBindRequestImpl.java | 32 +- ...modifiableExternalSASLBindRequestImpl.java | 32 +- ...UnmodifiableGSSAPISASLBindRequestImpl.java | 32 +- .../UnmodifiableGenericBindRequestImpl.java | 32 +- ...nmodifiableGenericExtendedRequestImpl.java | 32 +- .../UnmodifiableModifyDNRequestImpl.java | 32 +- .../UnmodifiableModifyRequestImpl.java | 32 +- ...ablePasswordModifyExtendedRequestImpl.java | 30 +- .../UnmodifiablePlainSASLBindRequestImpl.java | 32 +- .../UnmodifiableSearchRequestImpl.java | 32 +- .../UnmodifiableSimpleBindRequestImpl.java | 32 +- ...modifiableStartTLSExtendedRequestImpl.java | 32 +- .../UnmodifiableUnbindRequestImpl.java | 30 +- ...UnmodifiableWhoAmIExtendedRequestImpl.java | 30 +- .../ldap/requests/WhoAmIExtendedRequest.java | 30 +- .../requests/WhoAmIExtendedRequestImpl.java | 32 +- .../opendj/ldap/requests/package-info.java | 30 +- .../responses/AbstractExtendedResult.java | 32 +- .../AbstractExtendedResultDecoder.java | 32 +- .../AbstractIntermediateResponse.java | 32 +- .../ldap/responses/AbstractResponseImpl.java | 32 +- .../ldap/responses/AbstractResultImpl.java | 32 +- ...bstractUnmodifiableExtendedResultImpl.java | 30 +- ...tUnmodifiableIntermediateResponseImpl.java | 30 +- .../AbstractUnmodifiableResponseImpl.java | 32 +- .../AbstractUnmodifiableResultImpl.java | 32 +- .../opendj/ldap/responses/BindResult.java | 32 +- .../opendj/ldap/responses/BindResultImpl.java | 32 +- .../opendj/ldap/responses/CompareResult.java | 32 +- .../ldap/responses/CompareResultImpl.java | 32 +- .../opendj/ldap/responses/ExtendedResult.java | 32 +- .../ldap/responses/ExtendedResultDecoder.java | 32 +- .../ldap/responses/GenericExtendedResult.java | 32 +- .../responses/GenericExtendedResultImpl.java | 32 +- .../GenericIntermediateResponse.java | 32 +- .../GenericIntermediateResponseImpl.java | 32 +- .../ldap/responses/IntermediateResponse.java | 32 +- .../PasswordModifyExtendedResult.java | 32 +- .../PasswordModifyExtendedResultImpl.java | 32 +- .../opendj/ldap/responses/Response.java | 32 +- .../opendj/ldap/responses/Responses.java | 32 +- .../opendj/ldap/responses/Result.java | 32 +- .../opendj/ldap/responses/ResultImpl.java | 32 +- .../ldap/responses/SearchResultEntry.java | 32 +- .../ldap/responses/SearchResultEntryImpl.java | 32 +- .../ldap/responses/SearchResultReference.java | 32 +- .../responses/SearchResultReferenceImpl.java | 32 +- .../responses/UnmodifiableBindResultImpl.java | 32 +- .../UnmodifiableCompareResultImpl.java | 30 +- ...UnmodifiableGenericExtendedResultImpl.java | 32 +- ...fiableGenericIntermediateResponseImpl.java | 32 +- ...iablePasswordModifyExtendedResultImpl.java | 32 +- .../responses/UnmodifiableResultImpl.java | 30 +- .../UnmodifiableSearchResultEntryImpl.java | 32 +- ...UnmodifiableSearchResultReferenceImpl.java | 32 +- .../UnmodifiableWhoAmIExtendedResultImpl.java | 32 +- .../ldap/responses/WhoAmIExtendedResult.java | 32 +- .../responses/WhoAmIExtendedResultImpl.java | 32 +- .../opendj/ldap/responses/package-info.java | 30 +- .../AbstractApproximateMatchingRuleImpl.java | 30 +- .../AbstractEqualityMatchingRuleImpl.java | 30 +- .../ldap/schema/AbstractMatchingRuleImpl.java | 32 +- .../AbstractOrderingMatchingRuleImpl.java | 32 +- .../AbstractSubstringMatchingRuleImpl.java | 32 +- .../ldap/schema/AbstractSyntaxImpl.java | 32 +- .../opendj/ldap/schema/AttributeType.java | 32 +- .../ldap/schema/AttributeTypeSyntaxImpl.java | 32 +- .../opendj/ldap/schema/AttributeUsage.java | 30 +- ...PasswordExactEqualityMatchingRuleImpl.java | 32 +- .../ldap/schema/AuthPasswordSyntaxImpl.java | 32 +- .../opendj/ldap/schema/BinarySyntaxImpl.java | 32 +- .../BitStringEqualityMatchingRuleImpl.java | 32 +- .../ldap/schema/BitStringSyntaxImpl.java | 32 +- .../BooleanEqualityMatchingRuleImpl.java | 32 +- .../opendj/ldap/schema/BooleanSyntaxImpl.java | 32 +- .../CaseExactEqualityMatchingRuleImpl.java | 32 +- .../CaseExactIA5EqualityMatchingRuleImpl.java | 32 +- ...CaseExactIA5SubstringMatchingRuleImpl.java | 32 +- .../CaseExactOrderingMatchingRuleImpl.java | 32 +- .../CaseExactSubstringMatchingRuleImpl.java | 32 +- .../CaseIgnoreEqualityMatchingRuleImpl.java | 32 +- ...CaseIgnoreIA5EqualityMatchingRuleImpl.java | 32 +- ...aseIgnoreIA5SubstringMatchingRuleImpl.java | 32 +- ...aseIgnoreListEqualityMatchingRuleImpl.java | 32 +- ...seIgnoreListSubstringMatchingRuleImpl.java | 32 +- .../CaseIgnoreOrderingMatchingRuleImpl.java | 32 +- .../CaseIgnoreSubstringMatchingRuleImpl.java | 32 +- .../CertificateExactAssertionSyntaxImpl.java | 34 +-- .../CertificateExactMatchingRuleImpl.java | 34 +-- .../schema/CertificateListSyntaxImpl.java | 32 +- .../schema/CertificatePairSyntaxImpl.java | 32 +- .../ldap/schema/CertificateSyntaxImpl.java | 32 +- .../schema/CollationMatchingRulesImpl.java | 30 +- .../ConflictingSchemaElementException.java | 30 +- .../opendj/ldap/schema/CoreSchema.java | 32 +- .../opendj/ldap/schema/CoreSchemaImpl.java | 34 +-- .../schema/CoreSchemaSupportedLocales.java | 30 +- .../ldap/schema/CountryStringSyntaxImpl.java | 34 +-- .../opendj/ldap/schema/DITContentRule.java | 32 +- .../ldap/schema/DITContentRuleSyntaxImpl.java | 32 +- .../opendj/ldap/schema/DITStructureRule.java | 32 +- .../schema/DITStructureRuleSyntaxImpl.java | 32 +- .../opendj/ldap/schema/DelayedSchema.java | 30 +- .../ldap/schema/DeliveryMethodSyntaxImpl.java | 32 +- ...irstComponentEqualityMatchingRuleImpl.java | 32 +- .../schema/DirectoryStringSyntaxImpl.java | 32 +- ...inguishedNameEqualityMatchingRuleImpl.java | 32 +- .../schema/DistinguishedNameSyntaxImpl.java | 32 +- ...eMetaphoneApproximateMatchingRuleImpl.java | 32 +- .../ldap/schema/EnhancedGuideSyntaxImpl.java | 32 +- .../ldap/schema/EnumOrderingMatchingRule.java | 32 +- .../opendj/ldap/schema/EnumSyntaxImpl.java | 32 +- .../schema/FacsimileNumberSyntaxImpl.java | 32 +- .../opendj/ldap/schema/FaxSyntaxImpl.java | 32 +- ...neralizedTimeEqualityMatchingRuleImpl.java | 32 +- ...neralizedTimeOrderingMatchingRuleImpl.java | 32 +- .../schema/GeneralizedTimeSyntaxImpl.java | 32 +- .../ldap/schema/GenerateCoreSchema.java | 287 ++++++++---------- .../opendj/ldap/schema/GuideSyntaxImpl.java | 32 +- .../ldap/schema/IA5StringSyntaxImpl.java | 32 +- .../IntegerEqualityMatchingRuleImpl.java | 32 +- ...irstComponentEqualityMatchingRuleImpl.java | 32 +- .../IntegerOrderingMatchingRuleImpl.java | 32 +- .../opendj/ldap/schema/IntegerSyntaxImpl.java | 32 +- .../opendj/ldap/schema/JPEGSyntaxImpl.java | 32 +- .../KeywordEqualityMatchingRuleImpl.java | 32 +- .../LDAPSyntaxDescriptionSyntaxImpl.java | 32 +- .../opendj/ldap/schema/MatchingRule.java | 32 +- .../opendj/ldap/schema/MatchingRuleImpl.java | 32 +- .../ldap/schema/MatchingRuleSyntaxImpl.java | 32 +- .../opendj/ldap/schema/MatchingRuleUse.java | 32 +- .../schema/MatchingRuleUseSyntaxImpl.java | 32 +- .../schema/NameAndOptionalUIDSyntaxImpl.java | 32 +- .../opendj/ldap/schema/NameForm.java | 32 +- .../ldap/schema/NameFormSyntaxImpl.java | 32 +- ...NumericStringEqualityMatchingRuleImpl.java | 32 +- ...NumericStringOrderingMatchingRuleImpl.java | 32 +- ...umericStringSubstringMatchingRuleImpl.java | 32 +- .../ldap/schema/NumericStringSyntaxImpl.java | 32 +- .../opendj/ldap/schema/OIDSyntaxImpl.java | 32 +- .../opendj/ldap/schema/ObjectClass.java | 32 +- .../ldap/schema/ObjectClassSyntaxImpl.java | 32 +- .../opendj/ldap/schema/ObjectClassType.java | 30 +- ...ectIdentifierEqualityMatchingRuleImpl.java | 32 +- ...irstComponentEqualityMatchingRuleImpl.java | 32 +- .../OctetStringEqualityMatchingRuleImpl.java | 32 +- .../OctetStringOrderingMatchingRuleImpl.java | 32 +- .../OctetStringSubstringMatchingRuleImpl.java | 32 +- .../ldap/schema/OctetStringSyntaxImpl.java | 32 +- .../ldap/schema/OtherMailboxSyntaxImpl.java | 32 +- .../ldap/schema/PostalAddressSyntaxImpl.java | 32 +- ...tationAddressEqualityMatchingRuleImpl.java | 32 +- .../schema/PresentationAddressSyntaxImpl.java | 32 +- .../schema/PrintableStringSyntaxImpl.java | 32 +- ...olInformationEqualityMatchingRuleImpl.java | 32 +- .../schema/ProtocolInformationSyntaxImpl.java | 32 +- .../opendj/ldap/schema/RegexSyntaxImpl.java | 32 +- .../forgerock/opendj/ldap/schema/Schema.java | 34 +-- .../opendj/ldap/schema/SchemaBuilder.java | 34 +-- .../opendj/ldap/schema/SchemaConstants.java | 34 +-- .../opendj/ldap/schema/SchemaElement.java | 32 +- .../opendj/ldap/schema/SchemaException.java | 32 +- .../opendj/ldap/schema/SchemaOptions.java | 30 +- .../opendj/ldap/schema/SchemaUtils.java | 32 +- .../ldap/schema/SchemaValidationPolicy.java | 30 +- .../schema/SubstringAssertionSyntaxImpl.java | 32 +- .../schema/SupportedAlgorithmSyntaxImpl.java | 32 +- .../forgerock/opendj/ldap/schema/Syntax.java | 32 +- .../opendj/ldap/schema/SyntaxImpl.java | 30 +- ...lephoneNumberEqualityMatchingRuleImpl.java | 32 +- ...ephoneNumberSubstringMatchingRuleImpl.java | 32 +- .../schema/TelephoneNumberSyntaxImpl.java | 32 +- .../TeletexTerminalIdentifierSyntaxImpl.java | 32 +- .../ldap/schema/TelexNumberSyntaxImpl.java | 32 +- .../schema/TimeBasedMatchingRulesImpl.java | 32 +- .../opendj/ldap/schema/UTCTimeSyntaxImpl.java | 32 +- .../schema/UUIDEqualityMatchingRuleImpl.java | 32 +- .../schema/UUIDOrderingMatchingRuleImpl.java | 32 +- .../opendj/ldap/schema/UUIDSyntaxImpl.java | 32 +- .../UniqueMemberEqualityMatchingRuleImpl.java | 32 +- .../schema/UnknownSchemaElementException.java | 30 +- ...PasswordExactEqualityMatchingRuleImpl.java | 32 +- .../ldap/schema/UserPasswordSyntaxImpl.java | 32 +- .../opendj/ldap/schema/package-info.java | 30 +- .../ldap/spi/BindResultLdapPromiseImpl.java | 32 +- .../opendj/ldap/spi/ConnectionState.java | 30 +- .../spi/ExtendedResultLdapPromiseImpl.java | 32 +- .../opendj/ldap/spi/IndexQueryFactory.java | 32 +- .../forgerock/opendj/ldap/spi/Indexer.java | 32 +- .../opendj/ldap/spi/IndexingOptions.java | 29 +- .../ldap/spi/LDAPConnectionFactoryImpl.java | 30 +- .../opendj/ldap/spi/LDAPConnectionImpl.java | 30 +- .../opendj/ldap/spi/LDAPListenerImpl.java | 30 +- .../opendj/ldap/spi/LdapPromiseImpl.java | 30 +- .../opendj/ldap/spi/LdapPromiseWrapper.java | 30 +- .../opendj/ldap/spi/LdapPromises.java | 30 +- .../forgerock/opendj/ldap/spi/Provider.java | 30 +- .../ldap/spi/ResultLdapPromiseImpl.java | 30 +- .../ldap/spi/SearchResultLdapPromiseImpl.java | 32 +- .../opendj/ldap/spi/TransportProvider.java | 30 +- .../opendj/ldap/spi/package-info.java | 30 +- .../opendj/ldif/AbstractLDIFReader.java | 32 +- .../opendj/ldif/AbstractLDIFStream.java | 32 +- .../opendj/ldif/AbstractLDIFWriter.java | 32 +- .../forgerock/opendj/ldif/ChangeRecord.java | 32 +- .../opendj/ldif/ChangeRecordReader.java | 32 +- .../opendj/ldif/ChangeRecordVisitor.java | 30 +- .../ldif/ChangeRecordVisitorWriter.java | 32 +- .../opendj/ldif/ChangeRecordWriter.java | 32 +- .../ldif/ConnectionChangeRecordWriter.java | 32 +- .../opendj/ldif/ConnectionEntryReader.java | 32 +- .../opendj/ldif/ConnectionEntryWriter.java | 32 +- .../forgerock/opendj/ldif/EntryGenerator.java | 32 +- .../forgerock/opendj/ldif/EntryReader.java | 32 +- .../forgerock/opendj/ldif/EntryWriter.java | 32 +- .../java/org/forgerock/opendj/ldif/LDIF.java | 29 +- .../opendj/ldif/LDIFChangeRecordReader.java | 32 +- .../opendj/ldif/LDIFChangeRecordWriter.java | 32 +- .../opendj/ldif/LDIFEntryReader.java | 32 +- .../opendj/ldif/LDIFEntryWriter.java | 32 +- .../ldif/RejectedChangeRecordListener.java | 29 +- .../opendj/ldif/RejectedLDIFListener.java | 29 +- .../forgerock/opendj/ldif/TemplateFile.java | 32 +- .../forgerock/opendj/ldif/TemplateTag.java | 32 +- .../forgerock/opendj/ldif/package-info.java | 30 +- opendj-core/src/main/javadoc/overview.html | 36 +-- .../com/forgerock/opendj/ldap/core.properties | 35 +-- .../forgerock/opendj/ldap/core_de.properties | 30 +- .../forgerock/opendj/ldap/core_es.properties | 30 +- .../forgerock/opendj/ldap/core_fr.properties | 34 +-- .../forgerock/opendj/ldap/core_ja.properties | 30 +- .../forgerock/opendj/ldap/core_ko.properties | 30 +- .../opendj/ldap/core_zh_CN.properties | 30 +- .../opendj/ldap/core_zh_TW.properties | 30 +- opendj-core/src/site/xdoc/index.xml.vm | 36 +-- ...ccountUsabilityRequestControlTestCase.java | 32 +- ...countUsabilityResponseControlTestCase.java | 32 +- .../opendj/util/ASCIICharPropTestCase.java | 32 +- .../opendj/util/OperatingSystemTestCase.java | 30 +- .../util/ReferenceCountedObjectTestCase.java | 30 +- .../opendj/util/StaticUtilsTestCase.java | 32 +- .../util/StringPrepProfileTestCase.java | 32 +- .../forgerock/opendj/util/UtilTestCase.java | 32 +- .../io/ASN1ByteSequenceReaderTestCase.java | 32 +- .../io/ASN1InputStreamReaderTestCase.java | 32 +- .../io/ASN1OutputStreamWriterTestCase.java | 32 +- .../opendj/io/ASN1ReaderTestCase.java | 34 +-- .../opendj/io/ASN1WriterTestCase.java | 32 +- .../opendj/io/LDAPReaderWriterTestCase.java | 30 +- .../forgerock/opendj/ldap/AVATestCase.java | 29 +- ...bstractAsynchronousConnectionTestCase.java | 32 +- .../opendj/ldap/AddressMaskTestCase.java | 32 +- .../ldap/AttributeDescriptionTestCase.java | 32 +- .../opendj/ldap/AttributeParserTestCase.java | 30 +- .../opendj/ldap/AttributesTestCase.java | 30 +- .../opendj/ldap/ByteSequenceReaderTest.java | 32 +- .../opendj/ldap/ByteSequenceTestCase.java | 32 +- .../ldap/ByteStringBuilderTestCase.java | 32 +- .../opendj/ldap/ByteStringTestCase.java | 32 +- .../opendj/ldap/CompactDnTestCase.java | 30 +- .../opendj/ldap/ConditionResultTestCase.java | 32 +- .../opendj/ldap/ConnectionPoolTestCase.java | 32 +- .../opendj/ldap/ConnectionsTestCase.java | 30 +- .../org/forgerock/opendj/ldap/DNTestCase.java | 32 +- .../opendj/ldap/DataProviderIterator.java | 29 +- .../opendj/ldap/EntriesTestCase.java | 32 +- .../forgerock/opendj/ldap/EntryTestCase.java | 32 +- .../forgerock/opendj/ldap/FilterTestCase.java | 32 +- .../opendj/ldap/GSERParserTestCase.java | 30 +- .../opendj/ldap/GeneralizedTimeTest.java | 32 +- .../HeartBeatConnectionFactoryTestCase.java | 30 +- .../org/forgerock/opendj/ldap/LDAPServer.java | 32 +- .../opendj/ldap/LDAPUrlTestCase.java | 30 +- .../opendj/ldap/LinkedAttributeTestCase.java | 32 +- .../opendj/ldap/LoadBalancerTestCase.java | 30 +- .../opendj/ldap/MemoryBackendTestCase.java | 30 +- .../ldap/MockConnectionEventListener.java | 30 +- .../forgerock/opendj/ldap/MockScheduler.java | 30 +- .../opendj/ldap/ModificationTypeTestCase.java | 29 +- .../opendj/ldap/PackedLongTestCase.java | 29 +- .../forgerock/opendj/ldap/RDNTestCase.java | 32 +- .../ldap/RequestLoadBalancerTestCase.java | 29 +- .../opendj/ldap/ResultCodeTestCase.java | 29 +- .../forgerock/opendj/ldap/SdkTestCase.java | 32 +- .../opendj/ldap/SearchScopeTestCase.java | 30 +- .../forgerock/opendj/ldap/TestCaseUtils.java | 32 +- .../opendj/ldap/TestCaseUtilsTestCase.java | 30 +- .../ldap/controls/ControlsTestCase.java | 32 +- .../ldap/requests/AbandonRequestTestCase.java | 32 +- .../ldap/requests/AddRequestTestCase.java | 32 +- .../AnonymousSASLBindRequestTestCase.java | 32 +- .../ldap/requests/BindRequestTestCase.java | 30 +- .../CRAMMD5SASLBindRequestTestCase.java | 32 +- .../CancelExtendedRequestTestCase.java | 30 +- .../ldap/requests/CompareRequestTestCase.java | 32 +- .../ldap/requests/DeleteRequestTestCase.java | 32 +- .../DigestMD5SASLBindRequestTestCase.java | 32 +- .../requests/ExtendedRequestTestCase.java | 30 +- .../ExternalSASLBindRequestTestCase.java | 32 +- .../GSSAPISASLBindRequestTestCase.java | 32 +- .../requests/GenericBindRequestTestCase.java | 32 +- .../GenericExtendedRequestTestCase.java | 30 +- .../requests/ModifyDNRequestTestCase.java | 32 +- .../ldap/requests/ModifyRequestTestCase.java | 32 +- ...PasswordModifyExtendedRequestTestCase.java | 30 +- .../PlainSASLBindRequestTestCase.java | 32 +- .../ldap/requests/RequestsTestCase.java | 32 +- .../ldap/requests/SearchRequestTestCase.java | 29 +- .../requests/SimpleBindRequestTestCase.java | 32 +- .../StartTLSExtendedRequestTestCase.java | 30 +- .../ldap/requests/UnbindRequestTestCase.java | 32 +- .../WhoAmIExtendedRequestTestCase.java | 30 +- .../ldap/responses/ResponsesTestCase.java | 32 +- .../schema/AbstractSchemaElementTestCase.java | 32 +- .../ldap/schema/AbstractSchemaTestCase.java | 32 +- ...AbstractSubstringMatchingRuleImplTest.java | 29 +- .../ldap/schema/AbstractSyntaxTestCase.java | 32 +- .../schema/ApproximateMatchingRuleTest.java | 32 +- .../schema/AttributeTypeBuilderTestCase.java | 30 +- .../ldap/schema/AttributeTypeSyntaxTest.java | 32 +- .../opendj/ldap/schema/AttributeTypeTest.java | 32 +- .../schema/AuthPasswordSyntaxImplTest.java | 30 +- .../BitStringEqualityMatchingRuleTest.java | 30 +- .../ldap/schema/BitStringSyntaxTest.java | 32 +- .../BooleanEqualityMatchingRuleTest.java | 30 +- .../CaseExactEqualityMatchingRuleTest.java | 30 +- .../CaseExactIA5EqualityMatchingRuleTest.java | 30 +- ...CaseExactIA5SubstringMatchingRuleTest.java | 32 +- .../CaseExactOrderingMatchingRuleTest.java | 30 +- .../CaseExactSubstringMatchingRuleTest.java | 32 +- .../CaseIgnoreEqualityMatchingRuleTest.java | 30 +- ...CaseIgnoreIA5EqualityMatchingRuleTest.java | 30 +- ...aseIgnoreIA5SubstringMatchingRuleTest.java | 32 +- .../CaseIgnoreOrderingMatchingRuleTest.java | 30 +- .../CaseIgnoreSubstringMatchingRuleTest.java | 32 +- .../CertificateExactMatchingRuleImplTest.java | 34 +-- .../ldap/schema/CertificateSyntaxTest.java | 34 +-- .../CollationEqualityMatchingRuleTest.java | 30 +- .../CollationGreaterThanMatchingRuleTest.java | 30 +- ...ionGreaterThanOrEqualMatchingRuleTest.java | 30 +- .../CollationLessThanMatchingRuleTest.java | 30 +- ...lationLessThanOrEqualMatchingRuleTest.java | 30 +- .../CollationSubstringMatchingRuleTest.java | 30 +- .../opendj/ldap/schema/CoreSchemaTest.java | 30 +- .../ldap/schema/CountryStringSyntaxTest.java | 35 +-- .../ldap/schema/DITContentRuleSyntaxTest.java | 32 +- .../ldap/schema/DITContentRuleTestCase.java | 30 +- .../ldap/schema/DITStructureRuleTestCase.java | 30 +- ...irstComponentEqualityMatchingRuleTest.java | 30 +- ...inguishedNameEqualityMatchingRuleTest.java | 32 +- .../schema/EntrySchemaCheckingTestCase.java | 31 +- .../ldap/schema/EnumSyntaxTestCase.java | 32 +- ...neralizedTimeEqualityMatchingRuleTest.java | 30 +- ...neralizedTimeOrderingMatchingRuleTest.java | 32 +- .../schema/GeneralizedTimeSyntaxTest.java | 32 +- .../opendj/ldap/schema/GuideSyntaxTest.java | 32 +- .../ldap/schema/IA5StringSyntaxTest.java | 32 +- .../IntegerEqualityMatchingRuleTest.java | 30 +- .../IntegerOrderingMatchingRuleTest.java | 32 +- .../opendj/ldap/schema/IntegerSyntaxTest.java | 32 +- .../opendj/ldap/schema/JPEGSyntaxTest.java | 32 +- .../opendj/ldap/schema/LDAPSyntaxTest.java | 32 +- .../ldap/schema/MatchingRuleSyntaxTest.java | 32 +- .../opendj/ldap/schema/MatchingRuleTest.java | 32 +- .../ldap/schema/MatchingRuleTestCase.java | 30 +- .../MatchingRuleUseBuilderTestCase.java | 30 +- .../schema/MatchingRuleUseSyntaxTest.java | 32 +- .../opendj/ldap/schema/NameFormTestCase.java | 30 +- ...NumericStringEqualityMatchingRuleTest.java | 30 +- ...NumericStringOrderingMatchingRuleTest.java | 30 +- ...umericStringSubstringMatchingRuleTest.java | 32 +- .../schema/ObjectClassBuilderTestCase.java | 30 +- .../ldap/schema/OrderingMatchingRuleTest.java | 32 +- .../ldap/schema/OtherMailboxSyntaxTest.java | 32 +- ...artialDateAndTimeMatchingRuleTestCase.java | 30 +- ...tationAddressEqualityMatchingRuleTest.java | 30 +- ...olInformationEqualityMatchingRuleTest.java | 30 +- .../ldap/schema/RegexSyntaxTestCase.java | 32 +- ...lativeTimeGreaterThanMatchingRuleTest.java | 30 +- .../RelativeTimeLessThanMatchingRuleTest.java | 30 +- .../ldap/schema/SchemaBuilderTestCase.java | 30 +- .../opendj/ldap/schema/SchemaCompatTest.java | 30 +- .../ldap/schema/SchemaOptionsTestCase.java | 30 +- .../opendj/ldap/schema/SchemaTestCase.java | 30 +- .../opendj/ldap/schema/SchemaUtilsTest.java | 32 +- .../schema/SubstitutionSyntaxTestCase.java | 32 +- .../schema/SubstringMatchingRuleTest.java | 32 +- .../opendj/ldap/schema/SyntaxTestCase.java | 32 +- .../schema/TelephoneNumberSyntaxTest.java | 30 +- .../opendj/ldap/schema/TelexSyntaxTest.java | 32 +- .../opendj/ldap/schema/UTCTimeSyntaxTest.java | 33 +- .../schema/UUIDEqualityMatchingRuleTest.java | 30 +- .../schema/UUIDOrderingMatchingRuleTest.java | 30 +- .../opendj/ldap/schema/UUIDSyntaxTest.java | 32 +- .../UniqueMemberEqualityMatchingRuleTest.java | 30 +- ...PasswordExactEqualityMatchingRuleTest.java | 30 +- .../schema/WordEqualityMatchingRuleTest.java | 30 +- .../ldap/spi/BasicLDAPConnectionFactory.java | 30 +- .../opendj/ldap/spi/BasicLDAPListener.java | 30 +- .../ldap/spi/BasicTransportProvider.java | 30 +- .../opendj/ldap/spi/ConnectionStateTest.java | 30 +- .../opendj/ldap/spi/LDAPTestCase.java | 32 +- .../opendj/ldif/AbstractLDIFTestCase.java | 32 +- .../ConnectionChangeRecordWriterTestCase.java | 32 +- .../ldif/ConnectionEntryReaderTestCase.java | 30 +- .../ldif/ConnectionEntryWriterTestCase.java | 32 +- .../opendj/ldif/EntryGeneratorTestCase.java | 30 +- .../ldif/LDIFChangeRecordReaderTestCase.java | 34 +-- .../ldif/LDIFChangeRecordWriterTestCase.java | 32 +- .../opendj/ldif/LDIFEntryReaderTestCase.java | 32 +- .../opendj/ldif/LDIFEntryWriterTestCase.java | 32 +- .../forgerock/opendj/ldif/LDIFTestCase.java | 32 +- .../opendj/ldif/TemplateTagTestcase.java | 30 +- ...orgerock.opendj.ldap.spi.TransportProvider | 33 +- opendj-doc-maven-plugin/pom.xml | 36 +-- .../opendj/maven/doc/CommandLineTool.java | 30 +- .../GenerateConfigurationReferenceMojo.java | 30 +- .../doc/GenerateGlobalAcisTableMojo.java | 29 +- .../maven/doc/GenerateMessageFileMojo.java | 32 +- .../maven/doc/GenerateRefEntriesMojo.java | 30 +- .../maven/doc/GenerateResultCodeDocMojo.java | 30 +- .../maven/doc/GenerateSchemaDocMojo.java | 29 +- .../org/forgerock/opendj/maven/doc/Utils.java | 30 +- .../opendj/maven/doc/package-info.java | 29 +- .../opendj/maven/doc/docs.properties | 32 +- .../templates/appendix-ldap-result-codes.ftl | 36 +-- .../templates/log-message-reference.ftl | 36 +-- .../templates/sec-locales-subtypes.ftl | 36 +-- .../resources/templates/table-global-acis.ftl | 36 +-- opendj-grizzly/pom.xml | 36 +-- .../grizzly/GrizzlyTransportProvider.java | 30 +- .../opendj/grizzly/package-info.java | 30 +- .../opendj/grizzly/ASN1BufferReader.java | 32 +- .../opendj/grizzly/ASN1BufferWriter.java | 32 +- .../ConnectionSecurityLayerFilter.java | 32 +- .../grizzly/DefaultTCPNIOTransport.java | 32 +- .../opendj/grizzly/GrizzlyLDAPConnection.java | 32 +- .../grizzly/GrizzlyLDAPConnectionFactory.java | 32 +- .../opendj/grizzly/GrizzlyLDAPListener.java | 32 +- .../opendj/grizzly/GrizzlyUtils.java | 30 +- .../opendj/grizzly/LDAPBaseFilter.java | 30 +- .../opendj/grizzly/LDAPClientFilter.java | 32 +- .../opendj/grizzly/LDAPServerFilter.java | 32 +- .../opendj/grizzly/package-info.java | 30 +- ...orgerock.opendj.ldap.spi.TransportProvider | 33 +- .../opendj/grizzly/grizzly.properties | 31 +- opendj-grizzly/src/site/xdoc/index.xml.vm | 36 +-- .../grizzly/ASN1BufferReaderTestCase.java | 32 +- .../grizzly/ASN1BufferWriterTestCase.java | 32 +- .../grizzly/ConnectionFactoryTestCase.java | 32 +- .../DefaultTCPNIOTransportTestCase.java | 32 +- .../GrizzlyLDAPConnectionFactoryTestCase.java | 30 +- .../GrizzlyLDAPConnectionTestCase.java | 30 +- .../grizzly/GrizzlyLDAPListenerTestCase.java | 32 +- .../GrizzlyLDAPReaderWriterTestCase.java | 30 +- .../opendj/grizzly/GrizzlyUtilsTestCase.java | 30 +- opendj-ldap-sdk-examples/pom.xml | 36 +-- .../src/main/assembly/examples.xml | 36 +-- .../forgerock/opendj/examples/Controls.java | 30 +- .../opendj/examples/ExtendedOperations.java | 30 +- .../examples/GetADChangeNotifications.java | 32 +- .../forgerock/opendj/examples/GetInfo.java | 30 +- .../org/forgerock/opendj/examples/Modify.java | 32 +- .../opendj/examples/ModifyAsync.java | 30 +- .../opendj/examples/ParseAttributes.java | 30 +- .../opendj/examples/PasswordResetForAD.java | 30 +- .../org/forgerock/opendj/examples/Proxy.java | 32 +- .../opendj/examples/ProxyBackend.java | 32 +- .../forgerock/opendj/examples/ReadSchema.java | 32 +- .../opendj/examples/RewriterProxy.java | 32 +- .../forgerock/opendj/examples/SASLAuth.java | 30 +- .../org/forgerock/opendj/examples/Search.java | 32 +- .../opendj/examples/SearchAsync.java | 30 +- .../forgerock/opendj/examples/SearchBind.java | 30 +- .../opendj/examples/SearchBindAsync.java | 30 +- .../org/forgerock/opendj/examples/Server.java | 32 +- .../forgerock/opendj/examples/ShortLife.java | 30 +- .../opendj/examples/ShortLifeAsync.java | 30 +- .../forgerock/opendj/examples/SimpleAuth.java | 30 +- .../opendj/examples/SimpleAuthAsync.java | 30 +- .../opendj/examples/UpdateGroup.java | 30 +- .../opendj/examples/UpdateGroupAsync.java | 29 +- .../opendj/examples/UseGenericControl.java | 32 +- .../forgerock/opendj/examples/UseSchema.java | 30 +- .../opendj/examples/UseSchemaAsync.java | 30 +- .../opendj/examples/package-info.java | 30 +- .../src/site/xdoc/index.xml.vm | 36 +-- opendj-ldap-toolkit/pom.xml | 36 +-- .../src/main/assembly/bat/addrate.bat | 31 +- .../src/main/assembly/bat/authrate.bat | 31 +- .../src/main/assembly/bat/ldapcompare.bat | 31 +- .../src/main/assembly/bat/ldapmodify.bat | 31 +- .../main/assembly/bat/ldappasswordmodify.bat | 31 +- .../src/main/assembly/bat/ldapsearch.bat | 31 +- .../src/main/assembly/bat/ldifdiff.bat | 31 +- .../src/main/assembly/bat/ldifmodify.bat | 31 +- .../src/main/assembly/bat/ldifsearch.bat | 31 +- .../src/main/assembly/bat/makeldif.bat | 31 +- .../src/main/assembly/bat/modrate.bat | 31 +- .../src/main/assembly/bat/searchrate.bat | 31 +- .../src/main/assembly/bin/addrate | 30 +- .../src/main/assembly/bin/authrate | 32 +- .../src/main/assembly/bin/ldapcompare | 32 +- .../src/main/assembly/bin/ldapmodify | 32 +- .../src/main/assembly/bin/ldappasswordmodify | 32 +- .../src/main/assembly/bin/ldapsearch | 32 +- .../src/main/assembly/bin/ldifdiff | 30 +- .../src/main/assembly/bin/ldifmodify | 30 +- .../src/main/assembly/bin/ldifsearch | 30 +- .../src/main/assembly/bin/makeldif | 30 +- .../src/main/assembly/bin/modrate | 32 +- .../src/main/assembly/bin/searchrate | 32 +- .../src/main/assembly/descriptor.xml | 36 +-- .../main/assembly/libbat/_client-script.bat | 31 +- .../src/main/assembly/libbat/_script-util.bat | 33 +- .../src/main/assembly/libbat/setcp.bat | 31 +- .../main/assembly/libbin/_client-script.sh | 30 +- .../src/main/assembly/libbin/_script-util.sh | 30 +- .../src/main/assembly/man-pages.xml | 36 +-- .../forgerock/opendj/ldap/tools/AddRate.java | 30 +- .../forgerock/opendj/ldap/tools/AuthRate.java | 32 +- .../opendj/ldap/tools/DataSource.java | 32 +- .../opendj/ldap/tools/LDAPCompare.java | 32 +- .../opendj/ldap/tools/LDAPModify.java | 32 +- .../opendj/ldap/tools/LDAPPasswordModify.java | 32 +- .../opendj/ldap/tools/LDAPSearch.java | 32 +- .../forgerock/opendj/ldap/tools/LDIFDiff.java | 32 +- .../opendj/ldap/tools/LDIFModify.java | 30 +- .../opendj/ldap/tools/LDIFSearch.java | 30 +- .../forgerock/opendj/ldap/tools/MakeLDIF.java | 32 +- .../forgerock/opendj/ldap/tools/ModRate.java | 32 +- .../opendj/ldap/tools/PerformanceRunner.java | 32 +- .../ldap/tools/PerformanceRunnerOptions.java | 30 +- .../opendj/ldap/tools/SdkVersionHandler.java | 29 +- .../opendj/ldap/tools/SearchRate.java | 32 +- .../opendj/ldap/tools/StatsThread.java | 30 +- .../forgerock/opendj/ldap/tools/Utils.java | 32 +- .../opendj/ldap/tools/package-info.java | 30 +- .../opendj/ldap/tools/tools.properties | 34 +-- .../opendj/ldap/tools/tools_de.properties | 30 +- .../opendj/ldap/tools/tools_es.properties | 30 +- .../opendj/ldap/tools/tools_fr.properties | 30 +- .../opendj/ldap/tools/tools_ja.properties | 30 +- .../opendj/ldap/tools/tools_ko.properties | 30 +- .../opendj/ldap/tools/tools_zh_CN.properties | 30 +- .../opendj/ldap/tools/tools_zh_TW.properties | 30 +- .../src/site/xdoc/index.xml.vm | 36 +-- .../opendj/ldap/tools/AddRateITCase.java | 30 +- .../opendj/ldap/tools/AuthRateITCase.java | 30 +- .../tools/ConnectionFactoryProviderTest.java | 30 +- .../opendj/ldap/tools/LDAPCompareITCase.java | 30 +- .../opendj/ldap/tools/LDAPSearchITCase.java | 30 +- .../opendj/ldap/tools/MakeLDIFITCase.java | 30 +- .../opendj/ldap/tools/ToolsITCase.java | 30 +- .../opendj/ldap/tools/ToolsTestCase.java | 32 +- opendj-rest2ldap/pom.xml | 27 +- opendj-rest2ldap/src/site/xdoc/index.xml.vm | 36 +-- opendj-sdk-parent/pom.xml | 38 +-- pom.xml | 36 +-- src/site/fml/faq.fml | 36 +-- src/site/resources/Example.ldif | 33 +- src/site/resources/big-group.ldif | 30 +- src/site/site.xml | 36 +-- src/site/xdoc/404.xml | 36 +-- src/site/xdoc/docs.xml | 36 +-- src/site/xdoc/index.xml | 36 +-- src/site/xdoc/news.xml | 36 +-- 870 files changed, 9506 insertions(+), 18215 deletions(-) mode change 100755 => 100644 opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java mode change 100755 => 100644 opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java mode change 100755 => 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java mode change 100755 => 100644 opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties mode change 100755 => 100644 opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties mode change 100755 => 100644 opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/libbat/_client-script.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/libbat/setcp.bat mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/libbin/_client-script.sh mode change 100755 => 100644 opendj-ldap-toolkit/src/main/assembly/libbin/_script-util.sh mode change 100755 => 100644 opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/package-info.java mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties mode change 100755 => 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index c2b67ef7c..a087660ba 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -1,28 +1,18 @@ 4.0.0 diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java index b2d3cf37a..160870dbf 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008-2010 Sun Microsystems, Inc. - * Portions Copyright 2009 Parametric Technology Corporation (PTC) - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2008-2010 Sun Microsystems, Inc. + * Portions Copyright 2009 Parametric Technology Corporation (PTC) + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java index 9f0d8781b..db3da969c 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Argument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java index e4ac32ade..049c7cccc 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java index e9b164899..6fbea184d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java index a66be26f9..0cbaf9486 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2008 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java index 9018fc231..96e570d2d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentParser.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java index 442546966..be5fb4323 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/BooleanArgument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java old mode 100755 new mode 100644 index f188adad6..32be644be --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ClientException.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ClientException.java index 4848ad582..6316bba77 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ClientException.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ClientException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java index d9fb2694a..2e2cfb8e5 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008-2009 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2008-2009 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index 951a2e50f..63f0a7d02 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index c12752266..3a1f658bb 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java old mode 100755 new mode 100644 index 6457971a4..6384a435d --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS - * Portions copyright 2011 Nemanja Lukić + * Copyright 2008-2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. + * Portions copyright 2011 Nemanja Lukić */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java index 71486f512..43bdfbdb4 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocDescriptionSupplement.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java index ba6bf75ac..b8f410ab0 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/DocGenerationHelper.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java index 42ad6c4b7..7a8d96252 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/FileBasedArgument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/HelpCallback.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/HelpCallback.java index 05659ceaf..ba118443e 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/HelpCallback.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/HelpCallback.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java index 1e727fa55..a17cb1258 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/IntegerArgument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Menu.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Menu.java index abd62b2c7..ec75b8204 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Menu.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Menu.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java index 98e56213a..07b3ce77e 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuBuilder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2007-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2007-2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuCallback.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuCallback.java index a7bc29d19..ba46c5ddd 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuCallback.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuCallback.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuResult.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuResult.java index 42fc7eee4..97efc142f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuResult.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MenuResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java index 05542efb1..7dd713c0b 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiChoiceArgument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java index 277f57c2d..a1ece9ad2 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/MultiColumnPrinter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java index c613fc36e..217e8496f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/PromptingTrustManager.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008-2010 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2008-2010 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ReturnCode.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ReturnCode.java index 5dc1a8d0d..b654eee1d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ReturnCode.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ReturnCode.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java index 48bd921aa..0919be448 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/StringArgument.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java index 303863b46..e6d3c82d3 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommand.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java index f044761c0..f2a5440e1 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandArgumentParser.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS. + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandUsageHandler.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandUsageHandler.java index 8a7bf893d..ff34872a6 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandUsageHandler.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/SubCommandUsageHandler.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java index 68b2275b0..369ffb918 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java index 6f3793045..984b49ef8 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableBuilder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TablePrinter.java index b54cd4cca..13fef0e73 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TablePrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TablePrinter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableSerializer.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableSerializer.java index 384672595..430233d01 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableSerializer.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TableSerializer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java index 78b3833f4..7620bb997 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2007-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Copyright 2007-2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolRefDocContainer.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolRefDocContainer.java index 08676d850..8a6f35d6f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolRefDocContainer.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolRefDocContainer.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java index 1b46c4b0f..aa8c578b5 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS. + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ValidationCallback.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ValidationCallback.java index da888119a..6220950f6 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ValidationCallback.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ValidationCallback.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/VersionHandler.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/VersionHandler.java index e31166c9a..6cc220fa8 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/VersionHandler.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/VersionHandler.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/package-info.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/package-info.java index a6ff22aeb..c8e38fa2b 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/package-info.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. + * Copyright 2014 ForgeRock AS. */ /** * Classes implementing the OpenDJ CLI shared APIs. diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties old mode 100755 new mode 100644 index 4c2d7fb7b..e893a3930 --- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties @@ -1,28 +1,18 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2014-2016 ForgeRock AS. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2014-2016 ForgeRock AS. + # # CLI messages # diff --git a/opendj-cli/src/main/resources/templates/dscfgAppendProps.ftl b/opendj-cli/src/main/resources/templates/dscfgAppendProps.ftl index da914fafc..4d20a023e 100644 --- a/opendj-cli/src/main/resources/templates/dscfgAppendProps.ftl +++ b/opendj-cli/src/main/resources/templates/dscfgAppendProps.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> ${title} diff --git a/opendj-cli/src/main/resources/templates/dscfgListItem.ftl b/opendj-cli/src/main/resources/templates/dscfgListItem.ftl index 9b49a1c34..d4836c232 100644 --- a/opendj-cli/src/main/resources/templates/dscfgListItem.ftl +++ b/opendj-cli/src/main/resources/templates/dscfgListItem.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> diff --git a/opendj-cli/src/main/resources/templates/dscfgListSubtypes.ftl b/opendj-cli/src/main/resources/templates/dscfgListSubtypes.ftl index 7aa96b181..5789cbc05 100644 --- a/opendj-cli/src/main/resources/templates/dscfgListSubtypes.ftl +++ b/opendj-cli/src/main/resources/templates/dscfgListSubtypes.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> diff --git a/opendj-cli/src/main/resources/templates/dscfgReference.ftl b/opendj-cli/src/main/resources/templates/dscfgReference.ftl index 236ca4e3d..860b8faa3 100644 --- a/opendj-cli/src/main/resources/templates/dscfgReference.ftl +++ b/opendj-cli/src/main/resources/templates/dscfgReference.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> ${marker} ${term} diff --git a/opendj-cli/src/main/resources/templates/dscfgVariableList.ftl b/opendj-cli/src/main/resources/templates/dscfgVariableList.ftl index 584b75421..79cf12a78 100644 --- a/opendj-cli/src/main/resources/templates/dscfgVariableList.ftl +++ b/opendj-cli/src/main/resources/templates/dscfgVariableList.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> diff --git a/opendj-cli/src/main/resources/templates/optionsRefSect1.ftl b/opendj-cli/src/main/resources/templates/optionsRefSect1.ftl index 23bb099cd..a07cc9bd4 100644 --- a/opendj-cli/src/main/resources/templates/optionsRefSect1.ftl +++ b/opendj-cli/src/main/resources/templates/optionsRefSect1.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> ${title} diff --git a/opendj-cli/src/main/resources/templates/refEntry.ftl b/opendj-cli/src/main/resources/templates/refEntry.ftl index b0c853f78..fcc32bbf8 100644 --- a/opendj-cli/src/main/resources/templates/refEntry.ftl +++ b/opendj-cli/src/main/resources/templates/refEntry.ftl @@ -1,54 +1,33 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> ${title} diff --git a/opendj-cli/src/main/resources/templates/refSect2.ftl b/opendj-cli/src/main/resources/templates/refSect2.ftl index 69c0ebb1a..4dcba4ea7 100644 --- a/opendj-cli/src/main/resources/templates/refSect2.ftl +++ b/opendj-cli/src/main/resources/templates/refSect2.ftl @@ -1,28 +1,17 @@ <#-- - # CDDL HEADER START + # The contents of this file are subject to the terms of the Common Development and + # Distribution License (the License). You may not use this file except in compliance with the + # License. # - # The contents of this file are subject to the terms of the - # Common Development and Distribution License, Version 1.0 only - # (the "License"). You may not use this file except in compliance - # with the License. + # You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + # specific language governing permission and limitations under the License. # - # 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 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 2015 ForgeRock AS. + # When distributing Covered Software, include this CDDL Header Notice in each file and include + # the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + # Header, with the fields enclosed by brackets [] replaced by your own identifying + # information: "Portions Copyright [year] [name of copyright owner]". # + # Copyright 2015 ForgeRock AS. #--> ${name} diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/CliTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/CliTestCase.java index 5690873d2..376e4994c 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/CliTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/CliTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. + * Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java index 601b9ce73..173c7004d 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. + * Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java index cd343e07c..79f26e13e 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandTestCase.java index 1ce1846e0..885a08ff5 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java index e0671bdda..18401c0ba 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.cli; diff --git a/opendj-copyright-maven-plugin/pom.xml b/opendj-copyright-maven-plugin/pom.xml index 640329775..606c33a2a 100644 --- a/opendj-copyright-maven-plugin/pom.xml +++ b/opendj-copyright-maven-plugin/pom.xml @@ -1,28 +1,18 @@ 4.0.0 diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java index 80c6d31da..6276f5784 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java index 91418b73a..336b2ce9e 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java index ff55239f4..411d1707e 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java index d9b45f5f6..97eece17f 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ /** Classes implementing the maven plugin to check and update source file copyrights. */ diff --git a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java index bfff6bc88..994ff1c03 100644 --- a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java +++ b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.maven; diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt index 1537c5702..322dbb017 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 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 2010-2013 Old Copyright Owner Inc. + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * + * Copyright 2010-2013 Old Copyright Owner Inc. */ EXPECTED OUTPUT: Portions Copyright YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-core/clirr-ignored-api-changes.xml b/opendj-core/clirr-ignored-api-changes.xml index 9533937d7..26c8257e1 100644 --- a/opendj-core/clirr-ignored-api-changes.xml +++ b/opendj-core/clirr-ignored-api-changes.xml @@ -1,27 +1,18 @@ 4.0.0 diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java index 1825cd5cf..acdf3bbc9 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java index cd150668d..69157bc09 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java index 5690f1dda..d4df79337 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java index ca89caf8e..1ef43fc51 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java index 3321ae28c..88892896b 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java index df1bafb8c..c18c197a5 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java index f7108abd5..ecacb65ba 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java index ba1e60d69..2287ae4ee 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java index 6b1066a7b..18f35e8d8 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java index 94ac629c7..4943507b0 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java index 61e24746b..ad1779bbc 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java index f965c18cd..67d94587a 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java index c62b7ce8e..6a48f2ce2 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java index 71e6ca5c0..1039e0b77 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.extensions; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java index 7bc9d5652..5de736eb5 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java index 831f23f92..3a6bf670e 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java index ee9b6c679..a18368244 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java index 1e90e8c93..5b29ddc67 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2013-2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java index dce8c8a73..bc5c51b52 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java index 705499f28..9a256a9f8 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java b/opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java index d0cdbf18c..2d7027259 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java index 888d53a88..9cdda2fb1 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java b/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java index f7aca1786..d7ff6eac8 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java b/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java index c7d22e095..a24b22a6f 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. + * Copyright 2006-2009 Sun Microsystems, Inc. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java b/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java index 27ea81cdd..7a32e63b3 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java b/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java index 58b849fc1..d7443bfbd 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java b/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java index de600a794..f2abf4000 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java b/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java index 8626357f7..1b5c369a0 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java index eb75b2e21..bc8690f35 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java index 204e80090..0a9ef1b8a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java index 4a8dec001..c6a152202 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java index d100db7d2..d952ebe38 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java index 67ba8caae..447455e9a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java index 5353d4a25..532daf40e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java index f0a95b473..7a05fd2c6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java index 4c994428f..750118035 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java index ac2433597..38de2966d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java index 03aad25cc..f431072b3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java index 89cc38cf7..c510dd695 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java index 334251ac4..2104f81f9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java index b4c91e13c..e74fe0c1c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java index ad6a68111..4a66ff4e1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java index 3c1cbeabb..f02871a73 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java index 31d8c678d..5a1839ace 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java index 4cc4ebe42..3c43771a3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java index f21e5ac8f..8e725ef50 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java index f492b0242..092e64066 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java index 3fbc33dd1..766107ba4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java index d771f1a19..ee0534ca1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java index 14a60c2a0..bcdf5cd44 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java index 6e8f2c4fb..72ee665cf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2012-2014 ForgeRock AS + * Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java index 751b88c82..13d222e7d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java index 3c60abc7c..dbb76acff 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java index a653cef42..4a63a008c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java index 87163803a..63c482a3e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java index b1beb4f48..7f732b6f1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java index 04aff9557..5e61bef3a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java index 8249babb0..0fa210941 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java index 213372616..e65e5b4a2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2012-2015 ForgeRock AS. + * Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java index 693b98f90..022d367fa 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java index 556d16f33..a167208a1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java index 593e109f7..d4cd07373 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java old mode 100755 new mode 100644 index 845575823..93f5e5aa9 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java old mode 100755 new mode 100644 index 7adf2a3b6..a8fa3a9e4 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java old mode 100755 new mode 100644 index 750ffb1b5..3cb9d89db --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java index 511bf65ad..63b504a48 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java old mode 100755 new mode 100644 index da0cc5e78..cb6702973 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java index a08b7f816..728123edc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java index ac206069e..1ccd50225 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011 ForgeRock AS + * Copyright 2011 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java index 08ae43da0..88d4a480f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java index 472369391..235499077 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java index af359b3ef..aa5f38f70 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java index c47fb61dd..9336052ac 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java index 17d7ff439..9cdc6e4af 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java index 95d407400..ab219dce6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java index eab9c65f1..a3befa964 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java index 95518b47f..47caa2dc2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2016 ForgeRock AS. + * Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java index 43a5c2f60..b8980100b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2014 ForgeRock AS + * Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java index c75e9e243..32418403a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java index 7bc89f483..547cfff75 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java index f8f6172a0..ab27ecce3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2013-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index e2deffcf5..5956133b0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java index 57c5c2847..2aadaae11 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java index 2d62cfe49..4e634ea90 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java index de0302dee..b86d84d38 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java index 38ef111ad..de3374595 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java index f3d461158..f35595979 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java index ef94ccc95..f80063056 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java index 991eba942..ef45d3ec3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java index e8bf106d4..6c802c74b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2011 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2011 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java index a91671172..939506d98 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java index 8cedfa84a..6c5465ea8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java index 283d04a37..0643b5d67 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2014 Manuel Gaupp + * Copyright 2013-2014 Manuel Gaupp */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java index cdb5167ee..d68dffb94 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2012-2015 ForgeRock AS. + * Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java index d0ccd15b4..d68dcc25c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java index 9960fd84d..f7ec3ec8b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java index 685f211ed..58f75abf8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java index d11fea232..39f5573d5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java index d3491ad15..7d5b69c00 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java index 5ddc35280..320ed4a98 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java index a7d9b8d37..48ff6bf81 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java index e0008dc9b..f0b3951f8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java index 9d8ec0f76..5dcb64190 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java index c568c090f..800fa70b0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java index 7d701deee..415fcb021 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java index d2e2d01ef..d37d31c3c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java index 8101f51c8..027717710 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java index 76ded9f9c..a7f8e065a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java index 724d59de9..e288bec01 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2016 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java index ed25c2b8b..3f74233b6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java index ade491909..3b42be5b4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java index 18cadc0c6..0fd6a7e1a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. + * Copyright 2009-2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java index f125ff389..46ff4e9ef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java index abc265ef2..b81ba27cb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java index d11e44726..b16d567a4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java index b21938f17..aef080808 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java index 37df786c9..98936b6ac 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. + * Copyright 2009-2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java index 8122759fe..cbcdb4609 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2012 ForgeRock AS + * Copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java index ff04de7b7..50dd0f2f9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java index 5f1a978ff..525e11575 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2014 ForgeRock AS + * Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java index 48937968d..fb192a53e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2015 ForgeRock AS + * Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java index b00775b51..3e12e3cdf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2016 ForgeRock AS. + * Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java index d72c6fa03..0f304e2b7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java index 049b9046e..5f734842c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java index bdc09e1f0..169d966ca 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java index 3d5a7306d..2e285dace 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java index 3ac214397..c9be04cf8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java index 248543e02..7952b330f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java index 94e8b4c06..a9af70961 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2013 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java index 26c928b8c..a8eab85b4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java index 2de690438..996b21638 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java index 601d6caa4..30555eb62 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java index 92b73d8d9..5f849187a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java index 438e4e481..5832dcf15 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2014 ForgeRock AS. + * Copyright 2013-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java index 86e4d3eac..9163da7ed 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java index ae47f0b51..658eecd54 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java index 2ce0075ab..91614eab3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java index 9f5a06d7e..4857c284b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java index e7c9ca727..18ccff8d7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java index d75d2d778..8dea2a9bd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java index 6a6db54b8..5518a3fef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java index ea035f3c8..ae1c61369 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java index 04a85f348..692330aab 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java index 9efc5faf3..631f2dab7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java index 1bd050b8c..066e1550c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java index 8c713f07c..43200e41d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java index 9ed24156d..d9966da01 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java index 9a1776283..2e4556b61 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java index 75c082364..a19e0b72b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java index e4b8eff58..d46cace1f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java index acbeaf5fa..e0d88a233 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java index 868f1ed4c..fa6c3dddf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java index 2f76b8939..9351647cf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java index 6cabb11a2..cbba897af 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java index 47149006b..a8fdc912a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java index 800ac0d9f..f0642a74e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java index a9802437a..e0fe8eb16 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java index b338b4bf7..6bb6a7ac7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java index 997e5075c..92e6cad36 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java index c645e8a61..01ebac84b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java index a7798ee88..1b4b77f89 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java index 4157e38a8..3395a6c8d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java index 7a2af725e..8ac94a3f0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java index c3362388d..134bc63ef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java index 0969d2bb8..2b7f41227 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java index ebb818cf0..e79b58ad0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java index 1e692b2dc..2e7535840 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java index 6588b8ed3..ccf9bc3ee 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java index 022a33bb9..334a945bf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java index c81269d85..908b5825f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java old mode 100755 new mode 100644 index bbffb97f2..8537df79b --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. + * Copyright 2009-2010 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java old mode 100755 new mode 100644 index 40d6bd0ce..b2139bd8a --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. + * Copyright 2009-2010 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java index a6a95cd88..351c4fce9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java index 6d36b64a0..5f10671fd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java index e310a3deb..89c11e750 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java index 3515ecb67..474c9cbc2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java index b61d568c4..084bc4902 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java index 4e6bfe1f2..f3a2e3b65 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java index 172023030..1edbf4f76 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java index 49d62162f..09e971e9f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java index 27cbe6e31..c744b82b9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java index d821452ec..3f31bfb96 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java index fe20a8135..e7d5b65fd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java index 252c785d3..9660f2121 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java index f1a40eca7..bda1bd65e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java index 36e8f457f..5f858acd4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java index b0ddf0298..fcd203b05 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java index 8f7311e11..ba4a06bf1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java index 9f312ab2b..31a1c1788 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java index 6bbe19828..62b07d2f3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java index 75ff8d116..568c7955f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java index cb05081d0..769da6b2b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java index e1888323b..8ead8b6b7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java index 38a8d450e..7b70cfb8c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java index 4184780e7..5d268333d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java index 3c994e544..08ff694a3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java index 8db62eb86..094df33cc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java index a067cda48..94f481477 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java index 078a4d279..5ad1118f6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java index 32ab2fd05..a3cdeaff1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java index 353359239..8b48411be 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java index 91b6e9875..635865457 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java index b23acf401..af07105c8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java index 935db60aa..58df4174e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java index e00a61c8f..0b5e05745 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java index d4d4ffd42..c59441358 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java index 8b095915d..52e553ac2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java index fc27b2924..32d79d0de 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java index 9fbd601c1..635ed9e42 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java index 08346539c..c206ca851 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java index 1cebae285..351c9d59d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java index 768cf3219..8066f9136 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java index 9ef22c29f..37c55e367 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java index 71b135a74..d0c6b969d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java index f8e72f873..692ed5759 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java index 76c045f5e..bf9549272 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java index 72aa2887f..2c8bcb2b5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java index 908720f92..2004689d0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java index 67191e4bd..0963615d4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java index 366081dab..a82efcfca 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java index 2df1e79e6..8bb67dba0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java index 810209345..6bef41d94 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java index 1c46b1017..e59d452fe 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java index 86da42a6e..50dbd4ff1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java index 3c2d14d6f..483513c3b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java index 2dd3b88b6..8de4d22a3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java index 56c38ad94..c0ea5bb6c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java index d138eda50..0fcab4fe2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java index 92efdb607..3bd33373f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java index 591bcca8d..c1265b7ab 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java index a38d5441a..cc98f18a1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java index 626dbbdba..1d9df297d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java index f82cc7d5c..863f6eb71 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java index 10f2bc459..d83e43ac7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java index e6190e4e3..c897005f6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java index 3625e66db..d67f45db6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java index 4081f4bff..dcf7c4718 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java index b61fecb72..2e70fcc76 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java index e116f55d0..59f12cc0d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java index 142a43823..4cde72bce 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java index 4ec7bc65f..9d91b68c9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java index 7b591696f..93934d616 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java index 4fe18881a..e49031e2a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java index 6e6e9888c..c8bd634bb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java index ed525992d..25a19df6f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java index fd3bd76b5..a2b2d7855 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java index bcbbf13b3..f577bb40f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2012 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java index 77f86c0c6..85762a204 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java index 43b5c3591..c82efc02f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java index e990af49c..3c8383cc7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java index a7af9dcfe..f1ad75c8d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java index b748d7b98..3d284c4be 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java old mode 100755 new mode 100644 index 8805522b5..437be6fb0 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java index d0b481ac2..9583f82be 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java index 958fb4356..63152ffe5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java index 793bd0599..b6d301060 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java index 59a235ba9..ba4dd507b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java index 1e8911def..ddcd8cf92 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java index 100cd8385..ed6521ac1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java index dc98f24d7..adc952065 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java index 1b6df59e5..e97fe0a3d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java index c1c4ec8c6..c9936c6fc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java index f53a66a58..ded8f50c4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java index 477ddacb3..cc9ea6cc4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java index d1d109ba2..2dabbac2b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java index 81da66da4..d5e795ab1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java index 340914f74..b00580331 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java index 92b18c7e6..a7a141197 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java index 559749b56..e2ae9be0a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java index 917433e19..dc1402c11 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java index d0804b21e..8948aa4d1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java index 1fe6f3e51..a68769dc2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java index 952d4afad..2d5aa79b7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java index 630ea11b7..f1116f3d6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java index 100d973b4..930b77e4e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java index e2632dfe3..17370461c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java index cf3e7a200..9659828dd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java index 63ca3a5de..2fe9875da 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java index 34035b7a6..4f97d9687 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java index cc176edb3..919aa2445 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java index 97d1fa1ec..549502291 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java index e27acab50..5dbc89f1a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java index 29e7b6af6..387b63cc5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java index 14ef66650..9065af3d0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java index 021776a84..f90a8625a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java index d5b815607..3fa20f8ed 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java index fb1e5799d..08b82fd6d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java index f7960ed6d..35cacaab0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java index 8bd82bfbc..0f6e50f38 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java index 6d9c15a52..ef7e8fb76 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java index 6fb4116f8..dd330db26 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java index d4339327b..a9c9a7f7d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java index 758e83aa6..1787f7d51 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java index 80508e13e..4f7b1847e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java old mode 100755 new mode 100644 index 721ed0de0..171eaf0b1 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java index 057d32179..ad3799652 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java index a521bf688..994232a16 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java index c6428d894..7313783c6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java index d3ef2bcdc..db3157842 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java index a9a3e453b..e47c0af97 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java index a9927168c..aeb49ec21 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java index f7703fce1..bd5b07be5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java index 450ca44eb..75bd65ca1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java index e19f28047..f37319868 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java index 04b118708..1e61b4d75 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java index 0d3683f2f..b24e5a8b9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java index 5b1707a61..aff428a34 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java index cb18e0c46..48861b0d1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java index 32d8cc8ca..887ecf6e9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java index dfa15d746..529727622 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java index bbb073854..a6b662428 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java index c1838469c..bc8237056 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java index edce186ce..7f31eae58 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java index 16ae03e9f..71b7de50c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java index ea7084d51..abd6eceac 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java index e8b691098..af43f461e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java index 271e48392..d085ce9a5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java index b6a4a1d4a..ba31a8a65 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java index bb0402407..39d4a7ceb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java index fbec64405..ec65dd2bb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java index 4c95a6757..56d2a7d99 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java index dae024d95..1a30f0371 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java index 547403549..3bc1a5fee 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java index 66272a7e7..dff39108a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 Manuel Gaupp - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java index e9c05c671..c81a94b8e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2013-2014 Manuel Gaupp - * Copyright 2014-2015 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions Copyright 2013-2014 Manuel Gaupp + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java index e3eca58f0..bae480edb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java index cb69d0245..4f2cfc83a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java index ec1ea87ba..d86ecdb6a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java index e01bf687d..07375ebe7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java index deb526ae5..a26ca4c47 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java index 276a290c6..663cf3e1c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java index 7389cbff7..01fb4c25e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. - * Portions copyright 2014 Manuel Gaupp + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2013-2015 ForgeRock AS. + * Portions copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java index f1d91fb52..f71a3cf4c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java index e111af82d..9900d4594 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012 Manuel Gaupp - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012 Manuel Gaupp + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java index 423de9834..131a386b9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java index e836fd77f..f13923e3d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java index 3349ca8da..6c0ccaf8c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2015-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java index fbde43486..2473bcd2a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java index 30ae44a97..9fb213c4e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2014 ForgeRock AS + * Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java index ba626af4b..f92318467 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java index dd82c7745..5343fce0c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java index 2772469d9..e27e7f93c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java index 7014b2d3a..3bd59732e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java index 6a109618e..9d6409fa1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java index 7510d240a..0478e5e18 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java index 176df026e..3837d16f8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java index c70d332a3..05aca0d77 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java index b854851ea..80356107a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java index 0f822fe7e..09689b1fc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java index 6fc1dc1f3..21db7827d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java index 46462adb4..12b98c847 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java index 2113efd78..39e8c1dc9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java index 0517d9018..90865bd3b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java index 71ed13d7b..d074f3bd7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java @@ -1,33 +1,24 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 Manuel Gaupp - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; +import java.io.PrintStream; import java.util.Arrays; import java.util.Calendar; import java.util.HashSet; @@ -100,193 +91,183 @@ public static void main(final String[] args) { objectClasses.put(fieldName, objectClass); } - System.out.println("/*"); - System.out.println(" * CDDL HEADER START"); - System.out.println(" *"); - System.out.println(" * The contents of this file are subject to the terms of the"); - System.out.println(" * Common Development and Distribution License, Version 1.0 only"); - System.out.println(" * (the \"License\"). You may not use this file except in compliance"); - System.out.println(" * with the License."); - System.out.println(" *"); - System.out.println(" * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt"); - System.out.println(" * or http://forgerock.org/license/CDDLv1.0.html."); - System.out.println(" * See the License for the specific language governing permissions"); - System.out.println(" * and limitations under the License."); - System.out.println(" *"); - System.out.println(" * When distributing Covered Code, include this CDDL HEADER in each"); - System.out.println(" * file and include the License file at legal-notices/CDDLv1_0.txt."); - System.out.println(" * If applicable, add the following below this CDDL HEADER, with the"); - System.out.println(" * fields enclosed by brackets \"[]\" replaced with your own identifying"); - System.out.println(" * information:"); - System.out.println(" * Portions Copyright [yyyy] [name of copyright owner]"); - System.out.println(" *"); - System.out.println(" * CDDL HEADER END"); - System.out.println(" *"); - System.out.println(" *"); - System.out.println(" * Copyright 2009 Sun Microsystems, Inc."); - final int year = Calendar.getInstance().get(Calendar.YEAR); - System.out.println(" * Portions copyright 2014" + (year > 2014 ? "-" + year : "") + " ForgeRock AS"); - System.out.println(" */"); - System.out.println("package org.forgerock.opendj.ldap.schema;"); - System.out.println(); - System.out.println(); - System.out.println("// DON'T EDIT THIS FILE!"); - System.out.println("// It is automatically generated using GenerateCoreSchema class."); - System.out.println(); - System.out.println("/**"); - System.out.println(" * The OpenDJ SDK core schema contains standard LDAP " + final PrintStream out = System.out; + out.println("/*"); + out.println(" * The contents of this file are subject to the terms of the Common Development and"); + out.println(" * Distribution License (the License). You may not use this file except in compliance with the"); + out.println(" * License."); + out.println(" *"); + out.println(" * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the"); + out.println(" * specific language governing permission and limitations under the License."); + out.println(" *"); + out.println(" * When distributing Covered Software, include this CDDL Header Notice in each file and include"); + out.println(" * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL"); + out.println(" * Header, with the fields enclosed by brackets [] replaced by your own identifying"); + out.println(" * information: \"Portions Copyright [year] [name of copyright owner]\"."); + out.println(" *"); + out.println(" * Copyright 2009 Sun Microsystems, Inc."); + out.println(" * Portions copyright 2014-" + Calendar.getInstance().get(Calendar.YEAR) + " ForgeRock AS."); + out.println(" */"); + out.println("package org.forgerock.opendj.ldap.schema;"); + out.println(); + out.println(); + out.println("// DON'T EDIT THIS FILE!"); + out.println("// It is automatically generated using GenerateCoreSchema class."); + out.println(); + out.println("/**"); + out.println(" * The OpenDJ SDK core schema contains standard LDAP " + "RFC schema elements. These include:"); - System.out.println(" * "); + out.println(" *

"); + out.println(" * The core schema is non-strict: attempts to retrieve"); + out.println(" * non-existent Attribute Types will return a temporary"); + out.println(" * Attribute Type having the Octet String syntax."); + out.println(" */"); + out.println("public final class CoreSchema {"); + + out.println(" // Core Syntaxes"); for (final Map.Entry syntax : syntaxes.entrySet()) { - System.out.println(" private static final Syntax " + syntax.getKey() + " ="); - System.out.println(" CoreSchemaImpl.getInstance().getSyntax(\"" + out.println(" private static final Syntax " + syntax.getKey() + " ="); + out.println(" CoreSchemaImpl.getInstance().getSyntax(\"" + syntax.getValue().getOID() + "\");"); } - System.out.println(); - System.out.println(" // Core Matching Rules"); + out.println(); + out.println(" // Core Matching Rules"); for (final Map.Entry matchingRule : matchingRules.entrySet()) { - System.out.println(" private static final MatchingRule " + matchingRule.getKey() + out.println(" private static final MatchingRule " + matchingRule.getKey() + " ="); - System.out.println(" CoreSchemaImpl.getInstance().getMatchingRule(\"" + out.println(" CoreSchemaImpl.getInstance().getMatchingRule(\"" + matchingRule.getValue().getOID() + "\");"); } - System.out.println(); - System.out.println(" // Core Attribute Types"); + out.println(); + out.println(" // Core Attribute Types"); for (final Map.Entry attributeType : attributeTypes.entrySet()) { - System.out.println(" private static final AttributeType " + attributeType.getKey() + out.println(" private static final AttributeType " + attributeType.getKey() + " ="); - System.out.println(" CoreSchemaImpl.getInstance().getAttributeType(\"" + out.println(" CoreSchemaImpl.getInstance().getAttributeType(\"" + attributeType.getValue().getOID() + "\");"); } - System.out.println(); - System.out.println(" // Core Object Classes"); + out.println(); + out.println(" // Core Object Classes"); for (final Map.Entry objectClass : objectClasses.entrySet()) { - System.out.println(" private static final ObjectClass " + objectClass.getKey() + " ="); - System.out.println(" CoreSchemaImpl.getInstance().getObjectClass(\"" + out.println(" private static final ObjectClass " + objectClass.getKey() + " ="); + out.println(" CoreSchemaImpl.getInstance().getObjectClass(\"" + objectClass.getValue().getOID() + "\");"); } - System.out.println(); - System.out.println(" // Prevent instantiation"); - System.out.println(" private CoreSchema() {"); - System.out.println(" // Nothing to do."); - System.out.println(" }"); - - System.out.println(); - System.out.println(" /**"); - System.out.println(" * Returns a reference to the singleton core schema."); - System.out.println(" *"); - System.out.println(" * @return The core schema."); - System.out.println(" */"); - System.out.println(" public static Schema getInstance() {"); - System.out.println(" return CoreSchemaImpl.getInstance();"); - System.out.println(" }"); + out.println(); + out.println(" // Prevent instantiation"); + out.println(" private CoreSchema() {"); + out.println(" // Nothing to do."); + out.println(" }"); + + out.println(); + out.println(" /**"); + out.println(" * Returns a reference to the singleton core schema."); + out.println(" *"); + out.println(" * @return The core schema."); + out.println(" */"); + out.println(" public static Schema getInstance() {"); + out.println(" return CoreSchemaImpl.getInstance();"); + out.println(" }"); for (final Map.Entry syntax : syntaxes.entrySet()) { - System.out.println(); + out.println(); final String description = toCodeJavaDoc(syntax.getValue().getDescription().replaceAll(" Syntax$", "") + " Syntax"); - System.out.println(" /**"); - System.out.println(" * Returns a reference to the " + description); - System.out.println(" * which has the OID " + out.println(" /**"); + out.println(" * Returns a reference to the " + description); + out.println(" * which has the OID " + toCodeJavaDoc(syntax.getValue().getOID()) + "."); - System.out.println(" *"); - System.out.println(" * @return A reference to the " + description + "."); + out.println(" *"); + out.println(" * @return A reference to the " + description + "."); - System.out.println(" */"); - System.out.println(" public static Syntax get" + toJavaName(syntax.getKey()) + "() {"); - System.out.println(" return " + syntax.getKey() + ";"); - System.out.println(" }"); + out.println(" */"); + out.println(" public static Syntax get" + toJavaName(syntax.getKey()) + "() {"); + out.println(" return " + syntax.getKey() + ";"); + out.println(" }"); } for (final Map.Entry matchingRule : matchingRules.entrySet()) { - System.out.println(); + out.println(); final String description = toCodeJavaDoc(matchingRule.getValue().getNameOrOID()); - System.out.println(" /**"); - System.out.println(" * Returns a reference to the " + description + " Matching Rule"); - System.out.println(" * which has the OID " + out.println(" /**"); + out.println(" * Returns a reference to the " + description + " Matching Rule"); + out.println(" * which has the OID " + toCodeJavaDoc(matchingRule.getValue().getOID()) + "."); - System.out.println(" *"); - System.out.println(" * @return A reference to the " + description + " Matching Rule."); + out.println(" *"); + out.println(" * @return A reference to the " + description + " Matching Rule."); - System.out.println(" */"); - System.out.println(" public static MatchingRule get" + toJavaName(matchingRule.getKey()) + "() {"); - System.out.println(" return " + matchingRule.getKey() + ";"); - System.out.println(" }"); + out.println(" */"); + out.println(" public static MatchingRule get" + toJavaName(matchingRule.getKey()) + "() {"); + out.println(" return " + matchingRule.getKey() + ";"); + out.println(" }"); } for (final Map.Entry attributeType : attributeTypes.entrySet()) { - System.out.println(); + out.println(); final String description = toCodeJavaDoc(attributeType.getValue().getNameOrOID()); - System.out.println(" /**"); - System.out.println(" * Returns a reference to the " + description + " Attribute Type"); - System.out.println(" * which has the OID " + out.println(" /**"); + out.println(" * Returns a reference to the " + description + " Attribute Type"); + out.println(" * which has the OID " + toCodeJavaDoc(attributeType.getValue().getOID()) + "."); - System.out.println(" *"); - System.out.println(" * @return A reference to the " + description + " Attribute Type."); + out.println(" *"); + out.println(" * @return A reference to the " + description + " Attribute Type."); - System.out.println(" */"); - System.out.println(" public static AttributeType get" + out.println(" */"); + out.println(" public static AttributeType get" + toJavaName(attributeType.getKey()) + "() {"); - System.out.println(" return " + attributeType.getKey() + ";"); - System.out.println(" }"); + out.println(" return " + attributeType.getKey() + ";"); + out.println(" }"); } for (final Map.Entry objectClass : objectClasses.entrySet()) { - System.out.println(); + out.println(); final String description = toCodeJavaDoc(objectClass.getValue().getNameOrOID()); - System.out.println(" /**"); - System.out.println(" * Returns a reference to the " + description + " Object Class"); - System.out.println(" * which has the OID " + out.println(" /**"); + out.println(" * Returns a reference to the " + description + " Object Class"); + out.println(" * which has the OID " + toCodeJavaDoc(objectClass.getValue().getOID()) + "."); - System.out.println(" *"); - System.out.println(" * @return A reference to the " + description + " Object Class."); + out.println(" *"); + out.println(" * @return A reference to the " + description + " Object Class."); - System.out.println(" */"); - System.out.println(" public static ObjectClass get" + toJavaName(objectClass.getKey()) + out.println(" */"); + out.println(" public static ObjectClass get" + toJavaName(objectClass.getKey()) + "() {"); - System.out.println(" return " + objectClass.getKey() + ";"); - System.out.println(" }"); + out.println(" return " + objectClass.getKey() + ";"); + out.println(" }"); } - System.out.println("}"); + out.println("}"); } private static boolean isOpenDSOID(final String oid) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java index 8e21b6ac7..2856fe87f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java index 31beed73a..1d3e4721b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java index d31f61072..c6cf7b4f8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java index 4d1b15781..3bb099b76 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java index c891c64e3..0a14a37b1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java index c31f99e45..ada5055fd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java index fc0d61b6b..35a0da10b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java index 859775e29..551120849 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java index 8cd302339..9a70761f6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java index 234505a6e..aa5f7de27 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java index 98f1fad83..fe17c061e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java index 11ea9b798..6901fe6e3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java index 052152242..24bb8cd72 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2015-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java index 6d1a10d77..52ba9f361 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java index 461df3231..9dfc6197c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java index fbd1e7a00..5be8d5025 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java index 59d48f6db..8abe06b42 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java index 172fd236d..ad47b2990 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java index 439dc3a19..18bca4197 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java index 150bea7e7..3e38b5a15 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java index 4f29ab419..1a8843c0d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java index e2b31dfa7..6b3aa04ca 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java index 4d939d415..a6b276c4f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java index 38c7a2caf..ba34ea979 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java index 1ecbd50c7..45410ea64 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java index a24c61706..8d37d45e2 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java index cad1c25e7..4c10cd16e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java index 3520f7f51..63b89435f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java index b74f1b768..48fefc3d8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java index 882f29ce1..16798e633 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java index bbd2e915e..854b267f7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java index eaa2e8afd..710817745 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java index 6e9eea870..6bb5bd68c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java index 44dfda1e1..91b108b48 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java index d542905b1..ffa1802e3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java index ac8e6281c..f3092b84b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java index b457f6b46..f01de907d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java index 3d13258a5..229797690 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java index da8620400..fdec7c79b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java index 266e4f326..e9db683e1 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java index 20e414c64..afb792554 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014 Manuel Gaupp - * Portions Copyright 2011-2016 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java index 09c25965a..eb59b39fc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2014 Manuel Gaupp - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java index 89fe8f7d5..eecfab571 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java index da69f9cc8..4e3f7d348 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java index 4a7532784..81710c9e6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java index 566b88c9f..30fa0ba8f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java index a7ea1f31a..5782888e4 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2014 ForgeRock AS + * Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java index 5e21b62d7..bb6277fb8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java index 2ead6a3f9..ab80a20b7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java index 9db3a7dc3..cc706c4b8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java index 7f822e8ad..78fb39475 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java index 101e28bc1..d66795095 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java index 03a309daf..c5bcd0def 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java index 4badf4320..3678b822b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java index 77c341e65..c66d91b37 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java index c682c12cb..1a87ae29b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java index c40fc9007..e3bc58cdb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java index bdc71a464..321e4cb72 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java index 233a01189..f1b2b5c45 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java index 5aaefe66e..3374dd799 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java index f238f0ee8..eb563469a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java index 3febe84f3..66fbe1600 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java index fd9ee3866..0be2e73b6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java index f9e8c4f1a..b4738887b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java index 254dd2d54..155c4b60e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java old mode 100755 new mode 100644 index 9c4234386..4214c6944 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java index ffdf50d40..9d7416dd5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java index 3a416d037..cec68d92c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java index f05d7f988..e8a956d01 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java index 346c1156d..1dc85e4c9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java index 6707d2df6..2fdbd4f79 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java index ac8d64f9b..7f7a0439a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java index 922250408..a01300e50 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java index 63a641a38..43ddff637 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java index d95991e5e..673ec697d 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2014 ForgeRock AS. + * Copyright 2013-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java index d515bb10f..06643bd58 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java index 0d4d24d51..43eaead13 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java index ddf09afe5..dd55d10c5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java index 2c0487edd..cd4e01a20 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java index 12daaa135..504f045ef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java index e6ae3e623..8fcef23f9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java index 8ee7c2e8b..ddfe3c5fc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java index b59caf05e..cd7c09870 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java index 82070c977..9e861ef53 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java index 84a0b966e..a00ff4387 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java index bbac42588..2a6c7740c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java index 61657f9ee..a291d204e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java index 908fb7d9f..628b7c415 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java index 4d957b23d..1f046f296 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java index 6cafbc6b0..793cb2a6c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java index cc8b743d3..2e1639a92 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java index 1ba6532b5..71078a534 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java index 742f248e9..290d49cc7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java index aaabd4453..38ec1c304 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java index 4be8f2239..11d673d22 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS + * Copyright 2006-2010 Sun Microsystems, Inc. + * Portions Copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java index 2d4cd47da..e4ed1c14c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java index c57dce656..dad41fa3b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java index 57dfb4bee..6b6fba052 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2016 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java index c89b0ccf6..9c32e1f2b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java index 84d591697..a3afde1aa 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java index 1508aea05..2c414bcda 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java index 0299cef88..87cac56f7 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java index ccd77a8e7..f804c3bc5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2016 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java index cf9b52f77..262a2edef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011 ForgeRock AS + * Copyright 2011 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java index aa2c92b62..a8c6887f6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions Copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java index 5230928d5..dfcabc926 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS + * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions Copyright 2013-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java old mode 100755 new mode 100644 index 82f3c53ba..8c5b38bc4 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ /** diff --git a/opendj-core/src/main/javadoc/overview.html b/opendj-core/src/main/javadoc/overview.html index 4ecc26355..3ff78100a 100644 --- a/opendj-core/src/main/javadoc/overview.html +++ b/opendj-core/src/main/javadoc/overview.html @@ -1,28 +1,18 @@ diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties old mode 100755 new mode 100644 index e054fd518..19d586ba2 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -1,30 +1,19 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2010 Sun Microsystems, Inc. -# Portions copyright 2011-2015 ForgeRock AS -# Portions Copyright 2014 Manuel Gaupp +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2010 Sun Microsystems, Inc. +# Portions copyright 2011-2015 ForgeRock AS. +# Portions Copyright 2014 Manuel Gaupp ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE=Unable to retrieve \ approximate matching rule %s used as the default for the %s attribute syntax. \ Approximate matching will not be allowed by default for attributes with this \ diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties old mode 100755 new mode 100644 index b4fd9c7b9..6d0ae76fb --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=Der angegebene Wert "%s" ist keine g\u00fcltige L\u00e4nderzeichenkette, da die L\u00e4nge nicht exakt zwei Zeichen betr\u00e4gt ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=Der angegebene Wert "%s" ist keine g\u00fcltige Liefermethode, da er keine Elemente enth\u00e4lt diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties old mode 100755 new mode 100644 index a3d1d3145..ca7fa207a --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=El valor proporcionado "%s" no es una cadena de pa\u00edses v\u00e1lida porque no tiene una longitud de dos caracteres. ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=El valor proporcionado "%s" no es un valor de m\u00e9todo de entrega v\u00e1lido porque no contiene elementos ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12=El valor proporcionado "%s" no es un valor de m\u00e9todo de entrega v\u00e1lido porque "%s" no es un m\u00e9todo v\u00e1lido diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties old mode 100755 new mode 100644 index 2c6f2cec7..2b044c554 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties @@ -1,27 +1,17 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. -# Portions copyright 2013 ForgeRock AS +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. +# Portions copyright 2013 ForgeRock AS. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=La valeur indiqu\u00e9e "%s" n'est pas une cha\u00eene de pays valide car elle n'a pas une longueur de deux caract\u00e8res exactement ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=La valeur indiqu\u00e9e "%s" n'est pas une m\u00e9thode de distribution valide car elle ne contient aucun \u00e9l\u00e9ment ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12=La valeur indiqu\u00e9e "%s" n'est pas une m\u00e9thode de distribution valide car "%s" n'est pas une m\u00e9thode valide @@ -97,4 +87,4 @@ ERR_ATTR_SYNTAX_DCR_PROHIBITED_REQUIRED_BY_AUXILIARY_272=La r\u00e8gle de conten ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR_282=Impossible d'analyser la valeur fournie "%s" en tant que nom valide distinctif car la valeur de l'attribut commence avec un caract\u00e8re en position %d qui doit \u00eatre \u00e9vit\u00e9 ERR_NO_SEARCH_RESULT_ENTRIES=La recherche a \u00e9t\u00e9 effectu\u00e9e avec succ\u00e8s mais n'a retourn\u00e9 aucune entr\u00e9e alors qu'une entr\u00e9e \u00e9tait attendue ERR_UNEXPECTED_SEARCH_RESULT_ENTRIES=La recherche a \u00e9t\u00e9 effectu\u00e9e avec succ\u00e8s mais a retourn\u00e9 %s entr\u00e9es alors qu'une seule entr\u00e9e \u00e9tait attendue -ERR_UNEXPECTED_SEARCH_RESULT_ENTRIES_NO_COUNT=La recherche a \u00e9t\u00e9 effectu\u00e9e avec succ\u00e8s mais a retourn\u00e9 plusieurs entr\u00e9es alors qu'une seule entr\u00e9e \u00e9tait attendue \ No newline at end of file +ERR_UNEXPECTED_SEARCH_RESULT_ENTRIES_NO_COUNT=La recherche a \u00e9t\u00e9 effectu\u00e9e avec succ\u00e8s mais a retourn\u00e9 plusieurs entr\u00e9es alors qu'une seule entr\u00e9e \u00e9tait attendue diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties old mode 100755 new mode 100644 index b394a957f..a6c1faab8 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=\u6307\u5b9a\u3055\u308c\u305f\u5024 "%s" \u306f\u3001\u9577\u3055\u304c\u6b63\u78ba\u306b 2 \u6587\u5b57\u3067\u306f\u306a\u3044\u305f\u3081\u3001\u6709\u52b9\u306a\u56fd\u6587\u5b57\u5217\u3067\u306f\u3042\u308a\u307e\u305b\u3093 ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=\u6307\u5b9a\u3055\u308c\u305f\u5024 "%s" \u306f\u3001\u8981\u7d20\u304c\u4e00\u5207\u542b\u307e\u308c\u3066\u3044\u306a\u3044\u305f\u3081\u3001\u6709\u52b9\u306a\u5b9f\u65bd\u30e1\u30bd\u30c3\u30c9\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093 ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12="%2$s" \u306f\u6709\u52b9\u306a\u30e1\u30bd\u30c3\u30c9\u3067\u306f\u306a\u3044\u305f\u3081\u3001\u6307\u5b9a\u3055\u308c\u305f\u5024 "%1$s" \u306f\u6709\u52b9\u306a\u5b9f\u65bd\u30e1\u30bd\u30c3\u30c9\u5024\u3067\u306f\u3042\u308a\u307e\u305b\u3093 diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties old mode 100755 new mode 100644 index 101975eed..f83ca9e1c --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=\uae38\uc774\uac00 \uc815\ud655\ud788 \ub450 \ubb38\uc790\uac00 \uc544\ub2c8\uae30 \ub54c\ubb38\uc5d0 \uc81c\uacf5\ub41c \uac12 \"%s\"\uc740(\ub294) \uc720\ud6a8\ud55c \uad6d\uac00 \ubb38\uc790\uc5f4\uc774 \uc544\ub2d9\ub2c8\ub2e4. ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=\uc694\uc18c\uac00 \ud3ec\ud568\ub418\uc5b4 \uc788\uc9c0 \uc54a\uae30 \ub54c\ubb38\uc5d0 \uc81c\uacf5\ub41c \uac12 \"%s\"\uc740(\ub294) \uc720\ud6a8\ud55c \uc804\ub2ec \ubc29\ubc95\uc774 \uc544\ub2d9\ub2c8\ub2e4. ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12=\"%2$s\"\uc774(\uac00) \uc720\ud6a8\ud55c \ubc29\ubc95\uc774 \uc544\ub2c8\uae30 \ub54c\ubb38\uc5d0 \uc81c\uacf5\ub41c \uac12 \"%1$s\"\uc740(\ub294) \uc720\ud6a8\ud55c \uc804\ub2ec \ubc29\ubc95\uc774 \uc544\ub2d9\ub2c8\ub2e4. diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties old mode 100755 new mode 100644 index 7e854acd5..3b6273c3d --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=\u63d0\u4f9b\u7684\u503c "%s" \u4e0d\u662f\u6709\u6548\u7684\u56fd\u5bb6/\u5730\u533a\u5b57\u7b26\u4e32\uff0c\u56e0\u4e3a\u957f\u5ea6\u5e76\u975e\u6070\u597d\u4e3a\u4e24\u4e2a\u5b57\u7b26 ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=\u63d0\u4f9b\u7684\u503c "%s" \u4e0d\u662f\u6709\u6548\u7684\u4f20\u9001\u65b9\u6cd5\u503c\uff0c\u56e0\u4e3a\u5b83\u4e0d\u5305\u542b\u4efb\u4f55\u5143\u7d20 ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12=\u63d0\u4f9b\u7684\u503c "%s" \u4e0d\u662f\u6709\u6548\u7684\u4f20\u9001\u65b9\u6cd5\u503c\uff0c\u56e0\u4e3a "%s" \u4e0d\u662f\u6709\u6548\u7684\u65b9\u6cd5 diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties old mode 100755 new mode 100644 index e56b5e4c0..0f214c172 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties @@ -1,26 +1,16 @@ -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2009 Sun Microsystems, Inc. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2009 Sun Microsystems, Inc. ERR_ATTR_SYNTAX_COUNTRY_STRING_INVALID_LENGTH_9=\u63d0\u4f9b\u7684\u503c\u300c%s\u300d\u4e0d\u662f\u6709\u6548\u7684\u570b\u5bb6/\u5730\u5340\u5b57\u4e32\uff0c\u56e0\u70ba\u5176\u9577\u5ea6\u4e0d\u662f\u6b63\u597d\u5169\u500b\u5b57\u5143 ERR_ATTR_SYNTAX_DELIVERY_METHOD_NO_ELEMENTS_11=\u63d0\u4f9b\u7684\u503c\u300c%s\u300d\u4e0d\u662f\u6709\u6548\u7684\u50b3\u9001\u65b9\u6cd5\u503c\uff0c\u56e0\u70ba\u5176\u4e2d\u4e0d\u5305\u542b\u4efb\u4f55\u5143\u7d20 ERR_ATTR_SYNTAX_DELIVERY_METHOD_INVALID_ELEMENT_12=\u63d0\u4f9b\u7684\u503c\u300c%s\u300d\u4e0d\u662f\u6709\u6548\u7684\u50b3\u9001\u65b9\u6cd5\u503c\uff0c\u56e0\u70ba\u300c%s\u300d\u4e0d\u662f\u6709\u6548\u7684\u65b9\u6cd5 diff --git a/opendj-core/src/site/xdoc/index.xml.vm b/opendj-core/src/site/xdoc/index.xml.vm index dd8c01285..cbedee42f 100644 --- a/opendj-core/src/site/xdoc/index.xml.vm +++ b/opendj-core/src/site/xdoc/index.xml.vm @@ -1,28 +1,18 @@ diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java index 5ca577ff6..a1aaea87a 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java index f8ca5bfe5..ab3ffc41c 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java index eee500e5c..10b3b8045 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java index a3dd03f6d..b28e814b6 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. + * Copyright 2014 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java index 7fde80c50..c2af56078 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 - * - * - * Portions copyright 2013 ForgeRock AS. + * Portions copyright 2013 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java index cd9a325a2..87bf93c4a 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java index 41215a360..6632c7c14 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java b/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java index 3cb63ede2..26c6e9421 100644 --- a/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java +++ b/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package com.forgerock.opendj.util; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java index 30f416e72..495f6c81b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java index 406819bf8..b8c0687c3 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java index 8b260de4c..7821b6705 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java index 23b943dd1..cee1bc8fc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java index 7fba32ad5..b68dc77d5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java index 41335a4bd..5ba17febc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.io; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java index f958a97fd..1c3993cb1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 - * - * Portions copyright 2016 ForgeRock AS. + * Portions copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java index 1363c4af7..6ee3a2b82 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java index 8108527ef..7dffda579 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java index 58e0fb6da..5efb17020 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java index 2acdcd05f..56da51263 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2012-2015 ForgeRock AS. + * Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java index 79d8421ef..d31dce9e4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java index 54ccd39eb..2b60f1890 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java index 9de5758b1..e7617427c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java index 0f21ea5ad..b3134d95e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java index 06c39c9f3..5fe9304de 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java index 4dceee4d6..2b26ad0bb 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java index 555a7979c..c61adf970 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS + * Copyright 2008 Sun Microsystems, Inc. + * Portions Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java index c1512adc2..3261d9850 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java index e589ce8bc..5d72977c8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2016 ForgeRock AS + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java index e08bc7090..33c3f71b4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java index 2bafa8bb1..6dabc39d0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java index 01265604c..46537a829 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java index d5a55b378..468e0602d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java index 130025374..74a97c841 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java index e33b3bb42..5b6310315 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2014 Manuel Gaupp + * Copyright 2013-2014 Manuel Gaupp */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java index 9faf8b210..a08e02026 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java index 3e7101ca1..98787a8c5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2016 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java index 25c6e94bf..25abde349 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java index ace585202..a316d9b8f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java index abfc94665..114a0a888 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java index 24c8dda73..da0a9112e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java index 8836f2650..f32c608ff 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2016 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java index 86c6bb491..223f49ab8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2012-2014 ForgeRock AS. + * Copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java index 517641360..1de769bbd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java index c95834e13..979e2fde9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java index 078fb1cfa..9b593d85d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java index 39113de64..26fdd6953 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java index 6500ff40b..e1e6d0b05 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2016 ForgeRock AS. + * Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java index 74604fe59..2d63ebff7 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java index e13003f74..735fda384 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java index fac4d9f84..9829399e9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java index a6646aa26..13134d3ca 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java index ba4df8781..ef59a8148 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java index a15090700..3d6900c5d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java index b498fa2ef..80c261af4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java index a4d0853e5..5098a8d90 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java index 39f0ced7e..6d824988e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java index 6a7435b3a..1302360c1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java index 41690c6d5..776456521 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java index ddcffd364..5fbd8eebb 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java index be929ad78..f91b7120e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java index c951572c9..acc83ced1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java index f5d567908..2ce693297 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java index 49593dbc7..0ccda7c4e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. + * Copyright 2010 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java index 4b5eb5eae..719b86c3c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java index 21b87a4db..c0b2aae50 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java index e7eeaa224..3732dfb9f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java index a53d3470f..7555c3531 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java index b1301596e..b04d46482 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java index fdcdf76a0..97d2cca7f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java index 37a986269..d5c8cd6ec 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java index bc71c0f56..cd00e1c37 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java index 5b01cd532..03a789160 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java index 2042b58fa..73d85182c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java index 65894839d..6c4e58f6e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java index 8aa7977bf..c958c33be 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java index 67e6f42bf..b6a88a86a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2013 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java index 8e44e0f41..04bd5d669 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java index e1690018b..8dae00cd2 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.responses; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java index 302d9af5d..f32f9c762 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java index 9f9a833ee..98ba71d3e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java index 4a5ac9dfd..ff6268826 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java index fff1f7dbd..f26c2834d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java index 8cb1fe6a5..3b7392fb4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java index 93d6ad39d..1a3f3071e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java index 88da6be69..6368d7bf6 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java index 38a475366..2d285c210 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Copyright 2015-2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java index 17d3bc664..84b4a5e20 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 - * - * - * Portions Copyright 2015 ForgeRock AS + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java index e788f2bfc..29efa5a39 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java index e0eab345f..e996ec6ad 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java index b1e73982c..f64bcb482 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java index d12cc6131..92e34b717 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java index abf20b3ca..ac0173f68 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java index 380363d72..4bb534b10 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java index b2f0d5ac4..842703d40 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java index 2a3de9fe8..3ff3625dd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java index 2c7cab8e3..155be02c6 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java index c826a5380..b3e863c2e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java index 7971e4242..1ccf4df67 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java index 28598575b..c674b1254 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java index fc192fb0b..d6ff79c09 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java index 1fb467386..fedff9681 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2006-2008 Sun Microsystems, Inc. - * Portions Copyright 2013-2014 Manuel Gaupp - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2006-2008 Sun Microsystems, Inc. + * Portions Copyright 2013-2014 Manuel Gaupp + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java index f22a84b4d..e2f1be85f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java index 00b1057ea..46681b313 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java index 3752552ad..05c5881f9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java index 9bd63972b..0df6838be 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java index 17017aa87..0dad0301e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java index 13dfc1275..685c38974 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java index 23868189f..a87e37c77 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java index 0f6ae1929..9527a75de 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java index 0a009d1d1..05f170219 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java @@ -1,30 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2012 Manuel Gaupp - * Portions copyright 2014 ForgeRock AS. + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2012 Manuel Gaupp + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java index ef90695a1..13c5ce1dc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java index b3246f4e3..735e375e5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java index 1cf899ac0..933f3d224 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java index bcc92a9f5..bb50df8cd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java index 121566bbd..c89336317 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2013-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java index 33d429114..5ac5881fa 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java @@ -1,27 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java index 71c03992f..652fb3e26 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java index eeeac74d4..f82ad3d3d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java index ca7ab8200..5d5ae407a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java index 9fa5e173e..1a48d5720 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java index c46802c05..76b1804d1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java index 732e9ad79..0f1b1d62e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java index 1daa2d694..c601f648a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java index d9fc857e3..033980d2e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java index 71c6b5900..508d0cf00 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java index fe48ba262..7c5616b96 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java index d80d1fef9..b3af72721 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java index 18dc614d0..aede007a8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java index 086dfbc19..538652d74 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java index 5b9292daa..5e7829e86 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java index cf88dec3a..8489a6bbd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java index 39415549b..18be3e05d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java index 98e03013c..f66aabf35 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java index 0e53965bf..2dc741275 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java index d89fcd071..0b1a9835a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java index bb006801b..86fefb16e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2016 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java index 37ad0a0da..626957582 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java index ae2a407bd..33f8034a0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java index dffd71482..70a430bd5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java index deca83356..1ecea6b3f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java index afad82a6f..e5f50c95f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java index 9ef118bbd..aff8addca 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java index 01552ae1e..f26172d68 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java index 2c33169a6..b586d52d4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java index dd0c5175a..8e86d10e9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java index 362bd9376..29c2e0772 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 - * - * - * Portions Copyright 2012-2016 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java index b86b813ba..5ab1e6c1d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011 ForgeRock AS. + * Copyright 2011 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java index 87b9e95c0..b36e7afe0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java index 32e6a27e4..5a399469a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java index 109ea67f8..217222beb 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java index 8d166f7fc..28c2c854c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java index 376da7eb5..cee7db719 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java index 54fee40f3..6c6f83d18 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2014 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java index 7054fa075..2b2a9f5e4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java index 7026accca..7365d43c1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014-2015 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java index aac77d57a..6fd438df5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java @@ -1,29 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 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 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2012-2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java index b54cc0f69..e749d86e8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java index 12e7a832c..79f777a60 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. + * Copyright 2009 Sun Microsystems, Inc. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java index fe8e47626..a5fdfc4e5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Copyright 2009 Sun Microsystems, Inc. + * Portions copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java index 4b376158c..5f1ad8a20 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java index ab7ab535d..dca925846 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java index 9e67dcd6a..981689d18 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014 ForgeRock AS + * Copyright 2014 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java index ed038ae51..9de0e0c5e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java index 6281bc1af..5c0c305fe 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java index 223d31252..f898bc6b3 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java index dafb5cdfc..fcff907b0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2016 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java index eb94928d5..6e5f8194b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java index 35ddf669e..6bd4903b8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java index 5b9030293..7255d5269 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java index d53751afa..733d3b512 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2016 ForgeRock AS + * Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java index 125a2ad77..8a9181efe 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011 ForgeRock AS - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2011 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java index cfa7e2a94..aa0f54b54 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java index 1096fdf70..fd5054789 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java @@ -1,29 +1,19 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011 ForgeRock AS - * Portions copyright 2012 ForgeRock AS. - * Portions Copyright 2014 Manuel Gaupp + * Copyright 2011 ForgeRock AS. + * Portions copyright 2012 ForgeRock AS. + * Portions Copyright 2014 Manuel Gaupp */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java index 360fd4ec2..1c45a2e97 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2011-2015 ForgeRock AS - * Portions copyright 2012 ForgeRock AS. + * Copyright 2011-2015 ForgeRock AS. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java index c9ee50b74..40fc8169f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java index 63d9e2795..633e5828b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java index be604530a..24db44bec 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java index e47e2a44e..a475dfc7a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.ldif; diff --git a/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider index 8e5ad9880..052a548e8 100644 --- a/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider +++ b/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider @@ -1,26 +1,15 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at 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. -# -org.forgerock.opendj.ldap.spi.BasicTransportProvider \ No newline at end of file +# Copyright 2013 ForgeRock AS. +org.forgerock.opendj.ldap.spi.BasicTransportProvider diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index 08f323458..1909e37f9 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -1,28 +1,18 @@ 4.0.0 diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/CommandLineTool.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/CommandLineTool.java index 711020b84..dc76e60e4 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/CommandLineTool.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/CommandLineTool.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java index ec0a96975..a035a20c6 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateConfigurationReferenceMojo.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java index cda91ee58..346a6f0fb 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateGlobalAcisTableMojo.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015-2016 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java index 95f65069b..a37020761 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2008-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS. + * Copyright 2008-2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java index 39e77028e..9747a9b6f 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateRefEntriesMojo.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateResultCodeDocMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateResultCodeDocMojo.java index 134a053df..dfe0be0b4 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateResultCodeDocMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateResultCodeDocMojo.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java index a5b8195f4..1d65b3f03 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateSchemaDocMojo.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java index 66e72844b..be8a961f9 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/Utils.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ package org.forgerock.opendj.maven.doc; diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/package-info.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/package-info.java index 8b4302359..0daf7e27f 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/package-info.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/package-info.java @@ -1,26 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2015 ForgeRock AS. + * Copyright 2015 ForgeRock AS. */ /** diff --git a/opendj-doc-maven-plugin/src/main/resources/org/forgerock/opendj/maven/doc/docs.properties b/opendj-doc-maven-plugin/src/main/resources/org/forgerock/opendj/maven/doc/docs.properties index 8a41989af..c7fd1d076 100644 --- a/opendj-doc-maven-plugin/src/main/resources/org/forgerock/opendj/maven/doc/docs.properties +++ b/opendj-doc-maven-plugin/src/main/resources/org/forgerock/opendj/maven/doc/docs.properties @@ -1,28 +1,18 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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 2015 ForgeRock AS. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # +# Copyright 2015 ForgeRock AS. + # # Documentation messages # diff --git a/opendj-doc-maven-plugin/src/main/resources/templates/appendix-ldap-result-codes.ftl b/opendj-doc-maven-plugin/src/main/resources/templates/appendix-ldap-result-codes.ftl index 3e531276c..158c532cf 100644 --- a/opendj-doc-maven-plugin/src/main/resources/templates/appendix-ldap-result-codes.ftl +++ b/opendj-doc-maven-plugin/src/main/resources/templates/appendix-ldap-result-codes.ftl @@ -1,28 +1,18 @@ <#-- Comment text comes from the Javadoc, so the language is English. -->

4.0.0 diff --git a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java index 3050a07d4..bde6ddc17 100644 --- a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java +++ b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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-2014 ForgeRock AS. + * Copyright 2013-2014 ForgeRock AS. */ package com.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java index cf66b1339..a7883497a 100644 --- a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java +++ b/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ /** diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java index 58e0e44a3..1226bdeeb 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java index 173d560eb..c50e864f4 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java index ee8211e9d..2f273c7a6 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java index 24ac74312..beb4102e0 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2014 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2014 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java index 04cea5183..a58423206 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2016 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java index 912c1bfb6..be856b225 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java index 8af1e2175..caaf57180 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java index 27a451dcd..2881ab243 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java index 22ce6f775..3f35af3ef 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java index 24f80a093..b5b308c67 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2016 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java index a502f1187..476347f26 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2012-2015 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java index 5e867d306..6437c04f9 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ /** diff --git a/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider index d273aa2e1..f16ebea99 100644 --- a/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider +++ b/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider @@ -1,26 +1,15 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at 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. -# -com.forgerock.opendj.grizzly.GrizzlyTransportProvider \ No newline at end of file +# Copyright 2013 ForgeRock AS. +com.forgerock.opendj.grizzly.GrizzlyTransportProvider diff --git a/opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties b/opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties old mode 100755 new mode 100644 index c0b3cbbf1..912064866 --- a/opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties +++ b/opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties @@ -1,28 +1,17 @@ # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 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-2014 ForgeRock AS. +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# 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. LDAP_CONNECTION_REQUEST_TIMEOUT=The request has failed because no response \ was received from the server within the %d ms timeout LDAP_CONNECTION_CONNECT_TIMEOUT=The connection attempt to server %s has failed \ diff --git a/opendj-grizzly/src/site/xdoc/index.xml.vm b/opendj-grizzly/src/site/xdoc/index.xml.vm index 49225621d..b210923ad 100644 --- a/opendj-grizzly/src/site/xdoc/index.xml.vm +++ b/opendj-grizzly/src/site/xdoc/index.xml.vm @@ -1,28 +1,18 @@ diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java index 97de2ec94..c5cd7af30 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java index 532b27e01..bedc9f48d 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2013 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2011-2013 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java index a38122f41..a7ac5eda7 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java index dc5487521..605f748e6 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012-2013 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java index fc15db1cf..349e2cafc 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java index cb591398e..9e44e6808 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java index 8cb84b618..b1005eb3c 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2011-2015 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java index 549cb58c7..73c7baec3 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java index b08217b05..c25eb8ccc 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 ForgeRock AS. */ package org.forgerock.opendj.grizzly; diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index 6cd9b403d..880bb4c51 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -1,28 +1,18 @@ 4.0.0 diff --git a/opendj-ldap-sdk-examples/src/main/assembly/examples.xml b/opendj-ldap-sdk-examples/src/main/assembly/examples.xml index 22f76f7d7..56f4c548f 100644 --- a/opendj-ldap-sdk-examples/src/main/assembly/examples.xml +++ b/opendj-ldap-sdk-examples/src/main/assembly/examples.xml @@ -1,28 +1,18 @@ diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index ae0ae2089..0f53ae3d3 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -1,28 +1,18 @@ 4.0.0 diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/addrate.bat b/opendj-ldap-toolkit/src/main/assembly/bat/addrate.bat index d6e8d425b..66be9fdf1 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bat/addrate.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/addrate.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2014 ForgeRock AS +rem Copyright 2014 ForgeRock AS. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat b/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat index 07645287d..ee463c35c 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/authrate.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2010 Sun Microsystems, Inc. +rem Copyright 2010 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat old mode 100755 new mode 100644 index f45774190..96083bd5c --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldapcompare.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2006-2008 Sun Microsystems, Inc. +rem Copyright 2006-2008 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat old mode 100755 new mode 100644 index b2d9e16c1..e69a74b61 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldapmodify.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2006-2008 Sun Microsystems, Inc. +rem Copyright 2006-2008 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat old mode 100755 new mode 100644 index fdd921836..6fd4ec816 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldappasswordmodify.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2006-2008 Sun Microsystems, Inc. +rem Copyright 2006-2008 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat old mode 100755 new mode 100644 index bad1fae55..b91e20340 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldapsearch.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2006-2008 Sun Microsystems, Inc. +rem Copyright 2006-2008 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat old mode 100755 new mode 100644 index 02d4b5131..57d155a23 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldifdiff.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2012 ForgeRock AS. +rem Copyright 2012 ForgeRock AS. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat old mode 100755 new mode 100644 index 17c16da7b..a2642ca35 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldifmodify.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2012 ForgeRock AS. +rem Copyright 2012 ForgeRock AS. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat b/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat old mode 100755 new mode 100644 index ef0c8a529..0f1c440a3 --- a/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/ldifsearch.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2012 ForgeRock AS. +rem Copyright 2012 ForgeRock AS. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat b/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat old mode 100755 new mode 100644 index 67cb47a7a..fe7a50dcd --- a/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/makeldif.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2013 ForgeRock AS. +rem Copyright 2013 ForgeRock AS. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat b/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat old mode 100755 new mode 100644 index 5fac190d3..d2aad8a9d --- a/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/modrate.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2009 Sun Microsystems, Inc. +rem Copyright 2009 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat b/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat old mode 100755 new mode 100644 index d2984a34f..9bcd1ac58 --- a/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat +++ b/opendj-ldap-toolkit/src/main/assembly/bat/searchrate.bat @@ -1,29 +1,18 @@ @echo off -rem CDDL HEADER START +rem The contents of this file are subject to the terms of the Common Development and +rem Distribution License (the License). You may not use this file except in compliance with the +rem License. rem -rem The contents of this file are subject to the terms of the -rem Common Development and Distribution License, Version 1.0 only -rem (the "License"). You may not use this file except in compliance -rem with the License. +rem You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +rem specific language governing permission and limitations under the License. rem -rem You can obtain a copy of the license at -rem legal-notices/CDDLv1_0.txt -rem or http://forgerock.org/license/CDDLv1.0.html. -rem See the License for the specific language governing permissions -rem and limitations under the License. +rem When distributing Covered Software, include this CDDL Header Notice in each file and include +rem the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +rem Header, with the fields enclosed by brackets [] replaced by your own identifying +rem information: "Portions Copyright [year] [name of copyright owner]". rem -rem When distributing Covered Code, include this CDDL HEADER in each -rem file and include the License file at legal-notices/CDDLv1_0.txt. -rem legal-notices/CDDLv1_0.txt. If applicable, -rem add the following below this CDDL HEADER, with the fields enclosed -rem by brackets "[]" replaced with your own identifying information: -rem Portions Copyright [yyyy] [name of copyright owner] -rem -rem CDDL HEADER END -rem -rem -rem Copyright 2009 Sun Microsystems, Inc. +rem Copyright 2009 Sun Microsystems, Inc. setlocal diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/addrate b/opendj-ldap-toolkit/src/main/assembly/bin/addrate index 62bb339b1..d435cd6ad 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/addrate +++ b/opendj-ldap-toolkit/src/main/assembly/bin/addrate @@ -1,28 +1,18 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2014-2015 ForgeRock AS. +# Copyright 2014-2015 ForgeRock AS. OPENDJ_INVOKE_CLASS="com.forgerock.opendj.ldap.tools.AddRate" diff --git a/opendj-ldap-toolkit/src/main/assembly/bin/authrate b/opendj-ldap-toolkit/src/main/assembly/bin/authrate index 0aaaa543b..b2552b59b 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/authrate +++ b/opendj-ldap-toolkit/src/main/assembly/bin/authrate @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2010 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 bef30c3a0..7c2856862 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapcompare @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2006-2008 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 9b011ea7e..063d6372c 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapmodify @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2006-2008 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 512f64019..ac8cbee0c 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldappasswordmodify @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2006-2008 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 5b04eabb8..1e221c3b0 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldapsearch @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2006-2008 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 81bffb9f5..ede3ee6f9 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifdiff @@ -1,28 +1,18 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2012-2015 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 f9a7c807d..a4a987834 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifmodify @@ -1,28 +1,18 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2012-2015 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 962c85cbb..f2bc7fca2 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch +++ b/opendj-ldap-toolkit/src/main/assembly/bin/ldifsearch @@ -1,28 +1,18 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2012-2015 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 8c0a262ed..86273b484 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/makeldif +++ b/opendj-ldap-toolkit/src/main/assembly/bin/makeldif @@ -1,28 +1,18 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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. # 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 4501c6894..b3a32f12b 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/modrate +++ b/opendj-ldap-toolkit/src/main/assembly/bin/modrate @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2009 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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 eca21e261..1096381f1 100644 --- a/opendj-ldap-toolkit/src/main/assembly/bin/searchrate +++ b/opendj-ldap-toolkit/src/main/assembly/bin/searchrate @@ -1,29 +1,19 @@ #!/bin/sh # -# CDDL HEADER START +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. # -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. # -# 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 Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". # -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at -# 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 2009 Sun Microsystems, Inc. -# Portions Copyright 2015 ForgeRock AS. +# 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/descriptor.xml b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml index 212b94566..ab4fdff0c 100644 --- a/opendj-ldap-toolkit/src/main/assembly/descriptor.xml +++ b/opendj-ldap-toolkit/src/main/assembly/descriptor.xml @@ -1,28 +1,18 @@ diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AddRateITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AddRateITCase.java index 2899ae43e..996780706 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AddRateITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AddRateITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java index 0754977f5..67a817ee7 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/AuthRateITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java index 634a13b73..b3050ce3b 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPCompareITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPCompareITCase.java index afe1bd66a..0efba742e 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPCompareITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPCompareITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java index 6b489d82f..545c6f0c1 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/LDAPSearchITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2016 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java index a8c6be437..53787f8f3 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java index c2793dfad..ca2c09cd1 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsITCase.java @@ -1,27 +1,17 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2014-2015 ForgeRock AS. + * Copyright 2014-2015 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java index c1e0300ac..2ea2c2ebc 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ToolsTestCase.java @@ -1,28 +1,18 @@ /* - * CDDL HEADER START + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. * - * 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 Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at 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 2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Copyright 2010 Sun Microsystems, Inc. + * Portions copyright 2012 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index f05eba474..85262a3dd 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -1,19 +1,18 @@ 4.0.0 diff --git a/opendj-rest2ldap/src/site/xdoc/index.xml.vm b/opendj-rest2ldap/src/site/xdoc/index.xml.vm index 49225621d..b210923ad 100644 --- a/opendj-rest2ldap/src/site/xdoc/index.xml.vm +++ b/opendj-rest2ldap/src/site/xdoc/index.xml.vm @@ -1,28 +1,18 @@ diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index 1657310ee..171d75e3f 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -1,28 +1,18 @@ 4.0.0 @@ -71,8 +61,6 @@ ${opendj.osgi.import.additional}, * - - org/forgerock/checkstyle/opendj-java-header diff --git a/pom.xml b/pom.xml index dce77fc77..64227c914 100644 --- a/pom.xml +++ b/pom.xml @@ -1,28 +1,18 @@ diff --git a/src/site/fml/faq.fml b/src/site/fml/faq.fml index ba39dd39a..e25559367 100644 --- a/src/site/fml/faq.fml +++ b/src/site/fml/faq.fml @@ -1,28 +1,18 @@ ,ou=People,dc=example,dc=com # and one big group, cn=Static,ou=Groups,dc=example,dc=com, including all users. diff --git a/src/site/site.xml b/src/site/site.xml index 9b7356f93..dbf9801b5 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -1,28 +1,18 @@ Date: Tue, 23 Feb 2016 16:07:18 +0100 Subject: [PATCH 059/125] OPENDJ-2689 Code cleanup --- .../maven/CopyrightAbstractMojo.java | 27 +++++++++---------- opendj-rest2ldap/pom.xml | 3 +-- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java index 336b2ce9e..19adfc0ec 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java @@ -125,20 +125,6 @@ protected DiffScmResult executeDiffCommand(ScmProviderRepository repo, ScmFileSe } - private String getLocalScmRootPath(final File basedir) throws ScmException { - final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(basedir, "rev-parse"); - cl.addArguments(new String[] { "--show-toplevel" }); - - final StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer(); - final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - final ScmLogger dummyLogger = new ScmLogDispatcher(); - - final int exitCode = GitCommandLineUtils.execute(cl, stdout, stderr, dummyLogger); - return exitCode == 0 ? stdout.getOutput().trim().replace(" ", "%20") - : basedir.getPath(); - } - - /** The string representation of the current year. */ Integer currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -224,6 +210,19 @@ List getChangedFiles() throws MojoExecutionException, MojoFailureException } } + private String getLocalScmRootPath(final File basedir) throws ScmException { + final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(basedir, "rev-parse"); + cl.addArguments(new String[] { "--show-toplevel" }); + + final StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer(); + final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); + final ScmLogger dummyLogger = new ScmLogDispatcher(); + + final int exitCode = GitCommandLineUtils.execute(cl, stdout, stderr, dummyLogger); + return exitCode == 0 ? stdout.getOutput().trim().replace(" ", "%20") + : basedir.getPath(); + } + private void ensureCommandSuccess(final ScmResult result, final String cmd) throws MojoFailureException { if (!result.isSuccess()) { final String message = "Impossible to perform scm " + cmd + " command because " + result.getCommandOutput(); diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 85262a3dd..43490d917 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -12,7 +12,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - Copyright 2012-2015 ForgeRock AS. + Copyright 2012-2016 ForgeRock AS. --> 4.0.0 @@ -31,7 +31,6 @@ bundle - org/forgerock/checkstyle/default-java-header org.forgerock.opendj.*;provide:=true, org.forgerock.json.*;provide:=true From d124cde4a2c6503e6c77bf815d1b769c95d0985e Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 23 Feb 2016 16:24:53 +0100 Subject: [PATCH 060/125] OPENDJ-2689 Update copyright plugin Apdapts the copyright maven plugin according to changes performed on copyright header in the previous commit. Also adapts unit tests. --- .../forgerock/maven/UpdateCopyrightMojo.java | 6 ++-- .../maven/UpdateCopyrightTestCase.java | 6 ++-- .../forgerock-bad-copyright-1.java} | 0 .../forgerock-bad-copyright-2.c} | 1 - .../forgerock-bad-copyright-3.java} | 2 +- .../forgerock-bad-copyright-4.h} | 2 +- .../forgerock-bad-copyright-5.txt} | 2 +- .../forgerock-bad-copyright-6.txt} | 2 +- .../forgerock-bad-copyright-7.html | 19 ++++++++++++ .../forgerock-bad-copyright-8.xml | 18 ++++++++++++ .../forgerock-bad-copyright-9.xsl | 16 ++++++++++ .../opendj-bad-copyright-1.txt | 28 ------------------ .../opendj-bad-copyright-2.txt | 27 ----------------- .../opendj-bad-copyright-3.txt | 25 ---------------- .../opendj-bad-copyright-4.txt | 17 ----------- .../opendj-bad-copyright-5.txt | 27 ----------------- .../opendj-bad-copyright-6.txt | 29 ------------------- ...ght-1.txt => openidm-bad-copyright-1.java} | 0 ...ght-2.txt => openidm-bad-copyright-2.java} | 0 ...ght-3.txt => openidm-bad-copyright-3.java} | 0 ...ght-4.txt => openidm-bad-copyright-4.java} | 0 ...ght-5.txt => openidm-bad-copyright-5.java} | 0 ...ght-6.txt => openidm-bad-copyright-6.java} | 0 pom.xml | 14 --------- 24 files changed, 62 insertions(+), 179 deletions(-) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-1.txt => forgerock-copyrights/forgerock-bad-copyright-1.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-2.txt => forgerock-copyrights/forgerock-bad-copyright-2.c} (99%) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-3.txt => forgerock-copyrights/forgerock-bad-copyright-3.java} (93%) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-4.txt => forgerock-copyrights/forgerock-bad-copyright-4.h} (93%) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-5.txt => forgerock-copyrights/forgerock-bad-copyright-5.txt} (93%) rename opendj-copyright-maven-plugin/src/test/resources/files/{openam-copyrights/openam-bad-copyright-6.txt => forgerock-copyrights/forgerock-bad-copyright-6.txt} (93%) create mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html create mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml create mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-1.txt => openidm-bad-copyright-1.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-2.txt => openidm-bad-copyright-2.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-3.txt => openidm-bad-copyright-3.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-4.txt => openidm-bad-copyright-4.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-5.txt => openidm-bad-copyright-5.java} (100%) rename opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/{openidm-bad-copyright-6.txt => openidm-bad-copyright-6.java} (100%) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java index 411d1707e..a362ae314 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java @@ -313,7 +313,7 @@ private String getNewCommentedLine() throws Exception { * Number of lines to add after the line which contains the lineBeforeCopyrightToken. * Used only if a new copyright line is needed. */ - @Parameter(required = true, defaultValue = "2") + @Parameter(required = true, defaultValue = "1") private Integer nbLinesToSkip; /** @@ -321,11 +321,11 @@ private String getNewCommentedLine() throws Exception { * copyright section. Used only if a new copyright or portion copyright is * needed. */ - @Parameter(required = true, defaultValue = "6") + @Parameter(required = true, defaultValue = "1") private Integer numberSpaceIdentation; /** The last non empty commented line before the copyright section. */ - @Parameter(required = true, defaultValue = "CDDL\\s+HEADER\\s+END") + @Parameter(required = true, defaultValue = "\\\"Portions Copyright \\[year\\] \\[name of copyright owner\\]\\\"") private String lineBeforeCopyrightRegExp; /** The regular expression which identifies a copyrighted line. */ diff --git a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java index 994ff1c03..d71bc81f7 100644 --- a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java +++ b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java @@ -48,7 +48,7 @@ public boolean accept(File directory, String fileName) { private static final String CURRENT_YEAR = Integer.toString(Calendar.getInstance().get(Calendar.YEAR)); private static final String RESOURCE_DIR = "src/test/resources/files/"; - private static final String[] TEST_FOLDERS = { "openam-copyrights", "opendj-copyrights", "openidm-copyrights"}; + private static final String[] TEST_FOLDERS = { "forgerock-copyrights", "openidm-copyrights"}; /** Customs tags in tests files. */ private static final String MUST_BE_REMOVED_TAG = "MUST BE REMOVED:"; @@ -73,9 +73,7 @@ public Object[][] testCases() { // New copyright end String { TEST_FOLDERS[0], "Portions\\s+Copyright\\s+\\[year\\]\\s+\\[name\\s+of\\s+copyright\\s+owner\\]", 1, 1, "Portions copyright", "Copyright", "ForgeRock\\s+AS", "ForgeRock AS." }, - { TEST_FOLDERS[1], "CDDL\\s+HEADER\\s+END", 1, 6, "Portions Copyright", "Copyright", - "ForgeRock\\s+AS\\.", "ForgeRock AS." }, - { TEST_FOLDERS[2], + { TEST_FOLDERS[1], "DO\\s+NOT\\s+ALTER\\s+OR\\s+REMOVE\\s+COPYRIGHT\\s+NOTICES\\s+OR\\s+THIS\\s+HEADER.", 1, 1, "Portions Copyrighted", "Copyright (c)", "ForgeRock\\s+AS\\.", "ForgeRock AS. All rights reserved." } diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-1.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-1.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c similarity index 99% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c index e8020b892..e89d8389e 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-2.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c @@ -16,4 +16,3 @@ MUST BE REMOVED: Copyright 2010 ForgeRock AS. EXPECTED OUTPUT: Copyright 2010-YEAR ForgeRock AS. - \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java similarity index 93% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java index f829e8222..7f738e29e 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-3.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java @@ -13,4 +13,4 @@ * */ - EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. \ No newline at end of file + EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h similarity index 93% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h index 44007f744..9bf2ebe14 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-4.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h @@ -14,4 +14,4 @@ * Copyright 2010 Old Copyright Owner Inc. */ - EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. \ No newline at end of file + EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt similarity index 93% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt index 8efdebd22..d785efa12 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-5.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt @@ -15,4 +15,4 @@ * copyright 2013-2014 Old copyright owner Inc. */ - EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. \ No newline at end of file + EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt similarity index 93% rename from opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt index 29824e64d..edffc9532 100644 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openam-copyrights/openam-bad-copyright-6.txt +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt @@ -17,4 +17,4 @@ */ MUST BE REMOVED: Portions copyright 2013-2014 ForgeRock AS. -EXPECTED OUTPUT: Portions copyright 2013-YEAR ForgeRock AS. \ No newline at end of file +EXPECTED OUTPUT: Portions copyright 2013-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html new file mode 100644 index 000000000..93f92afeb --- /dev/null +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html @@ -0,0 +1,19 @@ + + + +MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS. +EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml new file mode 100644 index 000000000..66a3306c8 --- /dev/null +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml @@ -0,0 +1,18 @@ + + +MUST BE REMOVED: Copyright 2013 ForgeRock AS. +EXPECTED OUTPUT: Copyright 2013-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl new file mode 100644 index 000000000..dc3b26e1a --- /dev/null +++ b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl @@ -0,0 +1,16 @@ + + +EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt deleted file mode 100644 index 06a8eb1d8..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-1.txt +++ /dev/null @@ -1,28 +0,0 @@ - - - -MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS. -EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt deleted file mode 100644 index 4c140eb64..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-2.txt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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. - */ - -MUST BE REMOVED: Copyright 2013 ForgeRock AS. -EXPECTED OUTPUT: Copyright 2013-YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt deleted file mode 100644 index e5f672171..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-3.txt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 - * - */ - -EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt deleted file mode 100644 index 322dbb017..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-4.txt +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2010-2013 Old Copyright Owner Inc. - */ - -EXPECTED OUTPUT: Portions Copyright YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt deleted file mode 100644 index 1c120bb0c..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-5.txt +++ /dev/null @@ -1,27 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2010-2012 Very Old copyright owner Inc. - * Copyright 2013-2014 Old copyright owner Inc. - */ - -EXPECTED OUTPUT: Portions Copyright YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt b/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt deleted file mode 100644 index 0c3a8220d..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/opendj-copyrights/opendj-bad-copyright-6.txt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * 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 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 2008-2010 Very Old copyright owner Inc. - * Portions Copyright 2011-2012 Old copyright owner Inc. - * Portions Copyright 2013-2014 ForgeRock AS. - */ - -MUST BE REMOVED: Portions Copyright 2013-2014 ForgeRock AS. -EXPECTED OUTPUT: Portions Copyright 2013-YEAR ForgeRock AS. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.txt b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java similarity index 100% rename from opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.txt rename to opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java diff --git a/pom.xml b/pom.xml index 64227c914..d4c9331d4 100644 --- a/pom.xml +++ b/pom.xml @@ -295,20 +295,6 @@ update-copyright - - - - (CDDL HEADER END|\"Portions Copyright \[year\] \[name of copyright owner\]\") - - From 30bed068c803b576b638d02d4d4188cfa0229112 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 23 Feb 2016 16:25:35 +0100 Subject: [PATCH 061/125] OPENDJ-2689 Improve copyright-maven-plugin Use enum to describe what a comment should looks like for supported extensions. Also renames test files in consequences. Add support for the following extensions: java.stub, mc, security, xml.vm --- .../maven/CopyrightAbstractMojo.java | 183 ++++++++++++------ .../forgerock/maven/UpdateCopyrightMojo.java | 37 ++-- 2 files changed, 138 insertions(+), 82 deletions(-) diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java index 19adfc0ec..f76d08554 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java @@ -92,14 +92,10 @@ public abstract class CopyrightAbstractMojo extends AbstractMojo { /** The file extensions to test. */ public static final List CHECKED_EXTENSIONS = Arrays.asList( - "bat", "c", "h", "html", "java", "ldif", "Makefile", "mc", "properties", "sh", "txt", "xml", "xsd", "xsl"); - - private static final List EXCLUDED_END_COMMENT_BLOCK_TOKEN = Arrays.asList("*/", "-->"); - private static final List SUPPORTED_COMMENT_MIDDLE_BLOCK_TOKEN = Arrays.asList("*", "#", "rem", "!"); - private static final List SUPPORTED_START_BLOCK_COMMENT_TOKEN = Arrays.asList("/*", "", Arrays.asList("!", "~", "")); + + static CommentParser createParserForFile(final String filePath) { + switch (resolveExtension(filePath)) { + case "java": + case "c": + case "h": + return JAVA; + case "fml": + case "html": + case "md": + case "xjb": + case "xml": + case "xml.vm": + case "xsd": + case "xsl": + return XML; + case "bat": + return BAT; + case "security": + case "sh": + case "ldif": + case "properties": + return SH; + case "mc": + return MC; + default: + return DEFAULT; + } + } + + private final String startBlock; + private final String endBlock; + private final List middleBlockTokens; + private String currentLine = ""; + private boolean supportCommentBlocks; + private boolean commentBlockOpened; + + CommentParser(final String... middleBlockTokens) { + this(null, null, Arrays.asList(middleBlockTokens)); + } + + CommentParser(final String startBlock, final String endBlock, final List middleBlockTokens) { + this.startBlock = startBlock; + this.endBlock = endBlock; + this.middleBlockTokens = middleBlockTokens; + this.supportCommentBlocks = startBlock != null && endBlock != null; + } + + void consumeLine(final String line) { + if (line != null) { + if (supportCommentBlocks && currentLine.endsWith(endBlock)) { + commentBlockOpened = false; + } + currentLine = line.trim(); + if (supportCommentBlocks && currentLine.startsWith(startBlock)) { + commentBlockOpened = true; + } + } + } + + boolean isCommentLine() { + return commentBlockOpened + || startsWithCommentLineToken(); + } + + private boolean startsWithCommentLineToken() { + return getCommentTokenInLine(currentLine) != null; + } + + private String getCommentTokenInLine(final String line) { + for (final String token : middleBlockTokens) { + if (line.startsWith(token)) { + return token; + } + } + return null; + } + + String getNewCommentedLine(final String line) throws Exception { + final String commentToken = getCommentTokenInLine(line.trim()); + if (commentToken == null) { + throw new Exception("Incompatibles comments lines in the file."); + } + + String resultLine = ""; + if (commentToken.isEmpty()) { + resultLine = " "; + } + return resultLine + line.substring(0, line.indexOf(commentToken) + commentToken.length()); + } + + boolean isNonEmptyCommentedLine() { + final String commentToken = getCommentTokenInLine(currentLine); + return commentToken == null || !commentToken.equals(currentLine); + } + } + /** The string representation of the current year. */ Integer currentYear = Calendar.getInstance().get(Calendar.YEAR); @@ -262,20 +369,12 @@ private boolean fileIsDisabled(final String scmFilePath) { /** Examines the provided files list to determine whether each changed file copyright is acceptable. */ void checkCopyrights() throws MojoExecutionException, MojoFailureException { for (final File changedFile : getChangedFiles()) { - if (!changedFile.exists() || !changedFile.isFile()) { - continue; - } - - final String changedFileName = changedFile.getPath(); - int lastPeriodPos = changedFileName.lastIndexOf('.'); - if (lastPeriodPos > 0) { - String extension = changedFileName.substring(lastPeriodPos + 1); - if (!CHECKED_EXTENSIONS.contains(extension.toLowerCase())) { - continue; - } - } else if (fileNameEquals("bin", changedFile.getParentFile()) - && fileNameEquals("resource", changedFile.getParentFile().getParentFile())) { - // ignore resource/bin directory. + if (!changedFile.exists() + || !changedFile.isFile() + || !CHECKED_EXTENSIONS.contains(resolveExtension(changedFile.getPath()).toLowerCase()) + || (fileNameEquals("bin", changedFile.getParentFile()) + && fileNameEquals("resource", changedFile.getParentFile().getParentFile()))) { + // Verify that the file must be checked (ignore bin/resource directory) continue; } @@ -295,11 +394,12 @@ private boolean fileNameEquals(String folderName, File file) { */ private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionException { try (BufferedReader reader = new BufferedReader(new FileReader(changedFile))) { + final CommentParser commentParser = CommentParser.createParserForFile(changedFile.getPath()); String line; while ((line = reader.readLine()) != null) { - String lowerLine = line.toLowerCase().trim(); - if (isCommentLine(lowerLine) - && lowerLine.contains("copyright") + commentParser.consumeLine(line); + if (commentParser.isCommentLine() + && line.toLowerCase().trim().contains("copyright") && line.contains(currentYear.toString()) && line.contains(copyrightOwnerToken)) { return true; @@ -312,39 +412,4 @@ private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionExce + " to check copyright date. No further copyright date checking will be performed."); } } - - private String getCommentToken(String line, boolean includesStartBlock) { - final List supportedTokens = new ArrayList<>(SUPPORTED_COMMENT_MIDDLE_BLOCK_TOKEN); - if (includesStartBlock) { - supportedTokens.addAll(SUPPORTED_START_BLOCK_COMMENT_TOKEN); - } - - if (trimmedLineStartsWith(line, EXCLUDED_END_COMMENT_BLOCK_TOKEN) != null) { - return null; - } - - return trimmedLineStartsWith(line, supportedTokens); - } - - private String trimmedLineStartsWith(String line, List supportedTokens) { - for (String token : supportedTokens) { - if (line.trim().startsWith(token)) { - return token; - } - } - return null; - } - - boolean isNonEmptyCommentedLine(String line) { - String commentToken = getCommentTokenInBlock(line); - return commentToken == null || !commentToken.equals(line.trim()); - } - - String getCommentTokenInBlock(String line) { - return getCommentToken(line, false); - } - - boolean isCommentLine(String line) { - return getCommentToken(line, true) != null; - } } diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java index a362ae314..a3d6abcb1 100644 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java @@ -106,8 +106,8 @@ private final class UpdateCopyrightFile { private boolean commentBlockEnded; private boolean portionsCopyrightNeeded; private boolean copyrightSectionPresent; + private CommentParser commentParser; private String curLine; - private String curLowerLine; private Integer startYear; private Integer endYear; private final BufferedReader reader; @@ -116,6 +116,7 @@ private final class UpdateCopyrightFile { private UpdateCopyrightFile(String filePath) throws IOException { this.filePath = filePath; reader = new BufferedReader(new FileReader(filePath)); + commentParser = CommentParser.createParserForFile(filePath); final File tmpFile = new File(filePath + ".tmp"); if (!tmpFile.exists()) { tmpFile.createNewFile(); @@ -174,12 +175,17 @@ private void writeCopyrightLine() throws Exception { previousLine = bufferedLines.get(indexAdd); } indexAdd++; + final String newCommentedLine = commentParser.getNewCommentedLine(previousLine); if (!portionsCopyrightNeeded) { for (int i = 0; i < nbLinesToSkip; i++) { - bufferedLines.add(indexAdd++, getNewCommentedLine()); + if (!bufferedLines.get(indexAdd).equals(newCommentedLine)) { + // We have a blank line already so do not add a new one. + bufferedLines.add(indexAdd, newCommentedLine); + } + indexAdd++; } } - final String newCopyrightLine = getNewCommentedLine() + final String newCopyrightLine = newCommentedLine + indent() + (portionsCopyrightNeeded ? newPortionsCopyrightLabel : newCopyrightLabel) + " " + currentYear + " " + forgeRockCopyrightLabel; bufferedLines.add(indexAdd, newCopyrightLine); @@ -219,7 +225,7 @@ private void readLineBeforeCopyrightToken() throws Exception { nextLine(); while (curLine != null) { if (curLineMatches(lineBeforeCopyrightCompiledRegExp)) { - if (!isCommentLine(curLowerLine)) { + if (!commentParser.isCommentLine()) { throw new Exception("The line before copyright token must be a commented line"); } lineBeforeCopyrightReaded = true; @@ -236,7 +242,7 @@ private boolean readOldCopyrightLine() throws Exception { while (curLine != null) { if (isOldCopyrightOwnerLine()) { return true; - } else if (isNonEmptyCommentedLine(curLine) + } else if (commentParser.isNonEmptyCommentedLine() || isCopyrightLine() || commentBlockEnded) { return false; @@ -250,7 +256,7 @@ private boolean readCopyrightLine() throws Exception { while (curLine != null) { if (isCopyrightLine()) { return true; - } else if ((isNonEmptyCommentedLine(curLine) && !isOldCopyrightOwnerLine()) + } else if ((commentParser.isNonEmptyCommentedLine() && !isOldCopyrightOwnerLine()) || commentBlockEnded) { return false; } @@ -277,6 +283,7 @@ private boolean lineMatches(String line, Pattern compiledRegExp) { private void nextLine() throws Exception { curLine = reader.readLine(); + commentParser.consumeLine(curLine); if (curLine == null && !copyrightUpdated) { throw new Exception("unexpected end of file while trying to read copyright"); } else if (curLine != null) { @@ -284,27 +291,11 @@ private void nextLine() throws Exception { } if (!copyrightUpdated) { - curLowerLine = curLine.trim().toLowerCase(); - if (lineBeforeCopyrightReaded && !isCommentLine(curLowerLine)) { + if (lineBeforeCopyrightReaded && !commentParser.isCommentLine()) { commentBlockEnded = true; } } } - - private String getNewCommentedLine() throws Exception { - int indexCommentToken = 1; - String commentToken = null; - String linePattern = null; - while (bufferedLines.size() > indexCommentToken && commentToken == null) { - linePattern = bufferedLines.get(indexCommentToken++); - commentToken = getCommentTokenInBlock(linePattern); - } - if (commentToken == null) { - throw new Exception("Incompatibles comments lines in the file."); - } - return linePattern.substring(0, linePattern.indexOf(commentToken) + 1); - } - } private static final Pattern OLD_COPYRIGHT_REGEXP = Pattern.compile(".*copyright.*", CASE_INSENSITIVE); From b99aaa92cf641a562daad76fb7a889dc67c2935b Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 24 Feb 2016 23:24:28 +0100 Subject: [PATCH 062/125] OPENDJ-2333 - remove unused i18n messages --- .../com/forgerock/opendj/cli/cli.properties | 507 ------------------ .../TestSubCommandArgumentParserTestCase.java | 8 +- .../com/forgerock/opendj/ldap/core.properties | 24 +- .../forgerock/opendj/ldap/tools/AddRate.java | 1 - .../opendj/ldap/tools/LDAPPasswordModify.java | 2 - .../opendj/ldap/tools/LDAPSearch.java | 5 - .../opendj/ldap/tools/LDIFSearch.java | 4 - .../forgerock/opendj/ldap/tools/MakeLDIF.java | 2 - .../opendj/ldap/tools/tools.properties | 201 ------- 9 files changed, 5 insertions(+), 749 deletions(-) diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties index e893a3930..5961af0ab 100644 --- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties @@ -13,9 +13,6 @@ # # Copyright 2014-2016 ForgeRock AS. -# -# CLI messages -# ERR_ARG_NO_VALUE_PLACEHOLDER=The %s argument is configured to take \ a value but no value placeholder has been defined for it ERR_ARG_NO_INT_VALUE=The %s argument does not have any value that \ @@ -24,18 +21,6 @@ ERR_ARG_CANNOT_DECODE_AS_INT=The provided value "%s" for the %s \ argument cannot be decoded as an integer ERR_ARG_INT_MULTIPLE_VALUES=The %s argument has multiple values and \ therefore cannot be decoded as a single integer value -ERR_ARG_NO_DOUBLE_VALUE=The %s argument does not have any value that \ - may be retrieved as a double -ERR_ARG_CANNOT_DECODE_AS_DOUBLE=The provided value "%s" for the %s \ - argument cannot be decoded as a double -ERR_ARG_DOUBLE_MULTIPLE_VALUES=The %s argument has multiple values and \ - therefore cannot be decoded as a single double value -ERR_ARG_NO_BOOLEAN_VALUE=The %s argument does not have any value \ - that may be retrieved as a Boolean -ERR_ARG_CANNOT_DECODE_AS_BOOLEAN=The provided value "%s" for the %s \ - argument cannot be decoded as a Boolean -ERR_ARG_BOOLEAN_MULTIPLE_VALUES=The %s argument has multiple values \ - and therefore cannot be decoded as a single Boolean value ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND=The %s argument \ configuration is invalid because the lower bound of %d is greater than the \ upper bound of %d @@ -109,21 +94,8 @@ INFO_TIME_IN_HOURS_MINUTES_SECONDS=%d hours, %d minutes, %d seconds INFO_TIME_IN_DAYS_HOURS_MINUTES_SECONDS=%d days, %d hours, %d minutes, %d \ seconds INFO_SUBCMDPARSER_WHERE_OPTIONS_INCLUDE=Command options: -ERR_MENU_BAD_CHOICE_SINGLE=Invalid response. Please enter a valid \ -menu option -INFO_MENU_PROMPT_SINGLE=Enter choice: INFO_MENU_PROMPT_RETURN_TO_CONTINUE=Press RETURN to continue ERR_CONSOLE_INPUT_ERROR=The response could not be read from the console due to the following error: %s -INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate: -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate? -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO=No -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION=Yes, for this session only -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS=Yes, also add it to a truststore -INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS=View certificate details -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN : %s -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n To '%s' -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer : %s INFO_PROMPT_SINGLE_DEFAULT=%s [%s]: INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage: java %s {options} INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage: %s {options} @@ -146,19 +118,6 @@ INFO_SUBCMDPARSER_GLOBAL_HEADING=The global options are: # # Tools messages # -ERR_CANNOT_INITIALIZE_ARGS=An unexpected error occurred while \ - attempting to initialize the command-line arguments: %s -ERR_ERROR_PARSING_ARGS=An error occurred while parsing the \ - command-line arguments: %s -INFO_PROCESSING_OPERATION=Processing %s request for %s -INFO_OPERATION_FAILED=%s operation failed -INFO_OPERATION_SUCCESSFUL=%s operation successful for DN %s -INFO_PROCESSING_COMPARE_OPERATION=Comparing type %s with value %s in \ - entry %s -INFO_COMPARE_OPERATION_RESULT_FALSE=Compare operation returned false for \ - entry %s -INFO_COMPARE_OPERATION_RESULT_TRUE=Compare operation returned true for \ - entry %s INFO_DESCRIPTION_TRUSTALL=Trust all server SSL certificates INFO_DESCRIPTION_BINDDN=DN to use to bind to the server INFO_DESCRIPTION_BINDPASSWORD=Password to use to bind to \ @@ -170,7 +129,6 @@ INFO_DESCRIPTION_ENCODING=Use the specified character set for \ INFO_DESCRIPTION_VERBOSE=Use verbose mode INFO_DESCRIPTION_KEYSTOREPATH=Certificate key store path INFO_DESCRIPTION_TRUSTSTOREPATH=Certificate trust store path -INFO_DESCRIPTION_KEYSTOREPASSWORD=Certificate key store PIN INFO_DESCRIPTION_HOST=Directory server hostname or IP address INFO_DESCRIPTION_PORT=Directory server port number INFO_DESCRIPTION_SHOWUSAGE=Display this usage information @@ -185,202 +143,25 @@ INFO_DESCRIPTION_PROXYAUTHZID=Use the proxied authorization \ control with the given authorization ID INFO_DESCRIPTION_RESTART=Attempt to automatically restart the \ server once it has stopped -INFO_DESCRIPTION_STOP_REASON=Reason the server is being stopped or \ - restarted -INFO_CHECK_STOPPABILITY=Used to determine whether the server can \ - be stopped or not and the mode to be used to stop it -INFO_DESCRIPTION_STOP_TIME=Indicates the date/time at which the \ - shutdown operation will begin as a server task expressed in format \ - YYYYMMDDhhmmssZ for UTC time or YYYYMMDDhhmmss for local time. A value of \ - '0' will cause the shutdown to be scheduled for \ - immediate execution. When this option is specified the operation will be \ - scheduled to start at the specified time after which this utility will exit \ - immediately -INFO_DESCRIPTION_BACKUP_ALL=Back up all backends in the server -INFO_MODIFY_DESCRIPTION_DEFAULT_ADD=Treat records with no changetype as \ - add operations -INFO_SEARCH_DESCRIPTION_BASEDN=Search base DN -INFO_SEARCH_DESCRIPTION_SIZE_LIMIT=Maximum number of entries to return \ - from the search -INFO_SEARCH_DESCRIPTION_TIME_LIMIT=Maximum length of time in seconds to \ - allow for the search INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE=Search scope ('base', 'one', 'sub', \ or 'subordinate') -INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY=Alias dereference policy \ - ('never', 'always', 'search', or 'find') ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM=The requested SASL mechanism \ "%s" is not supported by this client ERR_LDAPAUTH_SASL_AUTHID_REQUIRED=The "authid" SASL property is \ required for use with the %s mechanism INFO_DESCRIPTION_VERSION=LDAP protocol version number -ERR_DESCRIPTION_INVALID_VERSION=Invalid LDAP version number '%s'. \ - Allowed values are 2 and 3 -ERR_SEARCH_NO_FILTERS=No filters specified for the search request -INFO_DESCRIPTION_DONT_WRAP=Do not wrap long lines INFO_DESCRIPTION_NOOP=Show what would be done but do not perform any \ operation -INFO_DESCRIPTION_TYPES_ONLY=Only retrieve attribute names but not their \ - values -INFO_DESCRIPTION_ASSERTION_FILTER=Use the LDAP assertion control with the \ - provided filter -ERR_LDAP_ASSERTION_INVALID_FILTER=The search filter provided for the \ - LDAP assertion control was invalid: %s -INFO_DESCRIPTION_PREREAD_ATTRS=Use the LDAP ReadEntry pre-read control -INFO_DESCRIPTION_POSTREAD_ATTRS=Use the LDAP ReadEntry post-read control -INFO_LDAPMODIFY_PREREAD_ENTRY=Target entry before the operation: -INFO_LDAPMODIFY_POSTREAD_ENTRY=Target entry after the operation: -INFO_DESCRIPTION_PROXY_AUTHZID=Use the proxied authorization control with \ - the given authorization ID -INFO_DESCRIPTION_PSEARCH_INFO=Use the persistent search control -ERR_PSEARCH_MISSING_DESCRIPTOR=The request to use the persistent \ - search control did not include a descriptor that indicates the options to use \ - with that control -ERR_PSEARCH_DOESNT_START_WITH_PS=The persistent search descriptor %s \ - did not start with the required 'ps' string -ERR_PSEARCH_INVALID_CHANGE_TYPE=The provided change type value %s is \ - invalid. The recognized change types are add, delete, modify, modifydn, and \ - any -ERR_PSEARCH_INVALID_CHANGESONLY=The provided changesOnly value %s is \ - invalid. Allowed values are 1 to only return matching entries that have \ - changed since the beginning of the search, or 0 to also include existing \ - entries that match the search criteria -ERR_PSEARCH_INVALID_RETURN_ECS=The provided returnECs value %s is \ - invalid. Allowed values are 1 to request that the entry change notification \ - control be included in updated entries, or 0 to exclude the control from \ - matching entries INFO_DESCRIPTION_REPORT_AUTHZID=Use the authorization identity control -INFO_BIND_AUTHZID_RETURNED=# Bound with authorization ID %s -INFO_SEARCH_DESCRIPTION_FILENAME=File containing a list of search filter \ - strings -INFO_DESCRIPTION_MATCHED_VALUES_FILTER=Use the LDAP matched values \ - control with the provided filter -ERR_LDAP_MATCHEDVALUES_INVALID_FILTER=The provided matched values \ - filter was invalid: %s -ERR_LDIF_FILE_CANNOT_OPEN_FOR_READ=An error occurred while \ - attempting to open the LDIF file %s for reading: %s -ERR_LDIF_FILE_CANNOT_OPEN_FOR_WRITE=An error occurred while \ - attempting to open the LDIF file %s for writing: %s -ERR_LDIF_FILE_READ_ERROR=An error occurred while attempting to read \ - the contents of LDIF file %s: %s -INFO_BIND_PASSWORD_EXPIRED=# Your password has expired -INFO_BIND_PASSWORD_EXPIRING=# Your password will expire in %s -INFO_BIND_ACCOUNT_LOCKED=# Your account has been locked -INFO_BIND_MUST_CHANGE_PASSWORD=# You must change your password before any \ - other operations will be allowed -INFO_BIND_GRACE_LOGINS_REMAINING=# You have %d grace logins remaining INFO_DESCRIPTION_USE_PWP_CONTROL=Use the password policy request control -INFO_LDAPPWMOD_DESCRIPTION_AUTHZID=Authorization ID for the \ - user entry whose password should be changed -INFO_LDAPPWMOD_DESCRIPTION_NEWPW=New password to provide \ - for the target user -INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE=Path to a file \ - containing the new password to provide for the target user -INFO_LDAPPWMOD_DESCRIPTION_CURRENTPW=Current password for \ - the target user -INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE=Path to a file \ - containing the current password for the target user -ERR_LDAPPWMOD_CONFLICTING_ARGS=The %s and %s arguments may not be \ - provided together -ERR_LDAPPWMOD_FAILED=The LDAP password modify operation failed: \ - %d (%s) -ERR_LDAPPWMOD_FAILURE_ERROR_MESSAGE=Error Message: %s -ERR_LDAPPWMOD_FAILURE_MATCHED_DN=Matched DN: %s -INFO_LDAPPWMOD_SUCCESSFUL=The LDAP password modify operation was \ - successful -INFO_LDAPPWMOD_ADDITIONAL_INFO=Additional Info: %s -INFO_LDAPPWMOD_GENERATED_PASSWORD=Generated Password: %s -INFO_COMPARE_CANNOT_BASE64_DECODE_ASSERTION_VALUE=The assertion value was \ - indicated to be base64-encoded, but an error occurred while trying to decode \ - the value -INFO_COMPARE_CANNOT_READ_ASSERTION_VALUE_FROM_FILE=Unable to read the \ - assertion value from the specified file: %s -ERR_LDAPCOMPARE_NO_DNS=No entry DNs provided for the compare \ - operation -INFO_LDAPCOMPARE_TOOL_DESCRIPTION=This utility can be used to perform \ - LDAP compare operations in the Directory Server -INFO_LDAPMODIFY_TOOL_DESCRIPTION=This utility can be used to perform LDAP \ - modify, add, delete, and modify DN operations in the Directory Server -INFO_LDAPPWMOD_TOOL_DESCRIPTION=This utility can be used to perform LDAP \ - password modify operations in the Directory Server -INFO_LDAPSEARCH_TOOL_DESCRIPTION=This utility can be used to perform LDAP \ - search operations in the Directory Server ERR_TOOL_CONFLICTING_ARGS=You may not provide both the --%s and \ the --%s arguments -ERR_LDAPCOMPARE_NO_ATTR=No attribute was specified to use as the \ - target for the comparison -ERR_LDAPCOMPARE_INVALID_ATTR_STRING=Invalid attribute string '%s'. \ - The attribute string must be in one of the following forms: \ - 'attribute:value', 'attribute::base64value', or 'attribute: ERR_CANNOT_READ_TRUSTSTORE=Cannot access trust store '%s'. Verify \ that the provided trust store exists and that you have read access rights to it ERR_CANNOT_READ_KEYSTORE=Cannot access key store '%s'. Verify \ that the provided key store exists and that you have read access rights to it INFO_DESCRIPTION_ADMIN_PORT=Directory server administration port number INFO_DESCRIPTION_ADMIN_BINDDN=Administrator user bind DN -ERR_LDAPCOMPARE_ERROR_READING_FILE=An error occurred reading file \ - '%s'. Check that the file exists and that you have read access rights to \ - it. Details: %s -ERR_LDAPCOMPARE_FILENAME_AND_DNS=Both entry DNs and a file name \ - were provided for the compare operation. These arguments are not compatible INFO_ERROR_EMPTY_RESPONSE=ERROR: a response must be provided in order to continue -ERR_DECODE_CONTROL_FAILURE=# %s -INFO_SEARCHRATE_TOOL_DESCRIPTION=This utility can be used to measure \ - search throughput and response time of a directory service using \ - user-defined searches.\n\n\ - Example:\n\n\ \ searchrate -p 1389 -D "cn=directory manager" -w password \\\n\ - \ \ \ \ -F -c 4 -t 4 -b "dc=example,dc=com" -g "rand(0,2000)" "(uid=user.%%d)" -INFO_SEARCHRATE_TOOL_DESCRIPTION_BASEDN=Base DN format string. -INFO_MODRATE_TOOL_DESCRIPTION=This utility can be used to measure \ - modify throughput and response time of a directory service using \ - user-defined modifications.\n\n\ - Example:\n\n\ \ modrate -p 1389 -D "cn=directory manager" -w password \\\n\ - \ \ \ \ -F -c 4 -t 4 -b "uid=user.%%d,ou=people,dc=example,dc=com" \\\n\ - \ \ \ \ -g "rand(0,2000)" -g "randstr(16)" 'description:%%2$s' -INFO_MODRATE_TOOL_DESCRIPTION_TARGETDN=Target entry DN format string -INFO_AUTHRATE_TOOL_DESCRIPTION=This utility can be used to measure \ - bind throughput and response time of a directory service using \ - user-defined bind or search-then-bind operations.\n\nFormat strings may be \ - used in the bind DN option as well as the authid and authzid SASL bind \ - options. A search operation may be used to retrieve the bind DN by \ - specifying the base DN and a filter. The retrieved entry DN will be appended \ - as the last argument in the argument list when evaluating format strings.\n\n\ - Example (bind only):\n\n\ \ authrate -p 1389 -D "uid=user.%%d,ou=people,dc=example,dc=com" \\\n\ - \ \ \ \ -w password -f -c 10 -g "rand(0,2000)"\n\n\ - Example (search then bind):\n\n\ \ authrate -p 1389 -D '%%2$s' -w password -f -c 10 \\\n\ - \ \ \ \ -b "ou=people,dc=example,dc=com" -s one -g "rand(0,2000)" "(uid=user.%%d)" -INFO_OUTPUT_LDIF_FILE_PLACEHOLDER={file} -INFO_LDIFMODIFY_DESCRIPTION_OUTPUT_FILENAME=Write updated entries to %s \ - instead of stdout -INFO_LDIFDIFF_DESCRIPTION_OUTPUT_FILENAME=Write differences to %s \ - instead of stdout -INFO_LDIFSEARCH_DESCRIPTION_OUTPUT_FILENAME=Write search results to %s \ - instead of stdout -ERR_LDIFMODIFY_MULTIPLE_USES_OF_STDIN=Unable to use stdin for both the source \ - LDIF and changes LDIF -ERR_LDIFDIFF_MULTIPLE_USES_OF_STDIN=Unable to use stdin for both the source \ - LDIF and target LDIF -ERR_LDIFMODIFY_PATCH_FAILED=The changes could not be applied for the following \ - reason: %s -ERR_LDIFDIFF_DIFF_FAILED=The differences could not be computed for the following \ - reason: %s -ERR_LDIFSEARCH_FAILED=The search could not be performed for the following \ - reason: %s -INFO_LDIFMODIFY_TOOL_DESCRIPTION=This utility can be used to apply a set of \ - modify, add, and delete operations to entries contained in an LDIF file -INFO_LDIFDIFF_TOOL_DESCRIPTION=This utility can be used to compare two LDIF \ - files and report the differences in LDIF format -INFO_LDIFSEARCH_TOOL_DESCRIPTION=This utility can be used to perform search \ - operations against entries contained in an LDIF file # # MakeLDIF tool # -INFO_MAKELDIF_TOOL_DESCRIPTION=This utility can be used to generate LDIF \ - data based on a definition in a template file -INFO_CONSTANT_PLACEHOLDER={name=value} -INFO_SEED_PLACEHOLDER={seed} -INFO_BATCH_FILE_PATH_PLACEHOLDER={batchFilePath} -INFO_MAKELDIF_DESCRIPTION_CONSTANT=A constant that overrides the value \ - set in the template file -INFO_MAKELDIF_DESCRIPTION_LDIF=The path to the LDIF file to be written -INFO_MAKELDIF_DESCRIPTION_SEED=The seed to use to initialize the random \ - number generator -INFO_MAKELDIF_DESCRIPTION_HELP=Show this usage information -INFO_MAKELDIF_DESCRIPTION_RESOURCE_PATH=Path to look for \ - MakeLDIF resources (e.g., data files) -ERR_MAKELDIF_NO_SUCH_RESOURCE_DIRECTORY=The specified resource \ - directory %s could not be found -INFO_MAKELDIF_PROCESSED_N_ENTRIES=Processed %d entries -INFO_MAKELDIF_PROCESSING_COMPLETE=LDIF processing complete. %d entries \ - written -ERR_MAKELDIF_EXCEPTION_DURING_PARSE=An error occurred while \ - parsing template file : %s -ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF=An error occurred while \ - attempting to open LDIF file %s for writing: %s -ERR_MAKELDIF_ERROR_WRITING_LDIF=An error occurred while writing data \ - to LDIF file %s: %s -ERR_MAKELDIF_EXCEPTION_DURING_PROCESSING=An error occurred while \ - processing : %s -ERR_CONSTANT_ARG_CANNOT_DECODE=Unable to parse a constant argument, \ - expecting name=value but got %s INFO_DESCRIPTION_QUIET=Use quiet mode INFO_DESCRIPTION_NO_PROMPT=Use non-interactive mode. If data in \ the command is missing, the user is not prompted and the tool will fail @@ -551,8 +221,6 @@ INFO_OPTION_ACCEPT_LICENSE=Automatically accepts the product license \ # # Setup messages # -INFO_SETUP_TITLE=OPENDJ3 Setup tool -INFO_SETUP_DESCRIPTION=This utility can be used to setup the Directory Server INFO_ARGUMENT_DESCRIPTION_CLI=Use the command line install. \ If not specified the graphical interface will be launched. The rest of the \ options (excluding help and version) will only be taken into account if this \ @@ -562,9 +230,6 @@ INFO_ARGUMENT_DESCRIPTION_BASEDN=Base DN for user \ using this option multiple times INFO_ARGUMENT_DESCRIPTION_ADDBASE=Indicates whether to create the base \ entry in the Directory Server database -INFO_ARGUMENT_DESCRIPTION_IMPORTLDIF=Path to an LDIF file \ - containing data that should be added to the Directory Server database. \ - Multiple LDIF files may be provided by using this option multiple times INFO_LDIFFILE_PLACEHOLDER={ldifFile} INFO_REJECT_FILE_PLACEHOLDER={rejectFile} INFO_SKIP_FILE_PLACEHOLDER={skipFile} @@ -572,7 +237,6 @@ INFO_JMXPORT_PLACEHOLDER={jmxPort} INFO_ROOT_USER_DN_PLACEHOLDER={rootUserDN} INFO_ROOT_USER_PWD_PLACEHOLDER={rootUserPassword} INFO_ROOT_USER_PWD_FILE_PLACEHOLDER={rootUserPasswordFile} -INFO_HOST_PLACEHOLDER={host} INFO_TIMEOUT_PLACEHOLDER={timeout} INFO_GENERAL_DESCRIPTION_REJECTED_FILE=Write rejected entries to the \ specified file @@ -584,14 +248,10 @@ INFO_ARGUMENT_DESCRIPTION_LDAPPORT=Port on which the \ Directory Server should listen for LDAP communication INFO_ARGUMENT_DESCRIPTION_ADMINCONNECTORPORT=Port on which the \ Administration Connector should listen for communication -INFO_ARGUMENT_DESCRIPTION_JMXPORT=Port on which the \ - Directory Server should listen for JMX communication INFO_ARGUMENT_DESCRIPTION_SKIPPORT=Skip the check to determine whether \ the specified ports are usable INFO_ARGUMENT_DESCRIPTION_ROOTDN=DN for the initial root \ user for the Directory Server -INFO_ARGUMENT_DESCRIPTION_ROOTPW=Password for the initial \ - root user for the Directory Server INFO_ARGUMENT_DESCRIPTION_ROOTPWFILE=Path to a file \ containing the password for the initial root user for the Directory Server INFO_ARGUMENT_DESCRIPTION_ENABLE_WINDOWS_SERVICE=Enable the server to run \ @@ -617,8 +277,6 @@ INFO_ARGUMENT_DESCRIPTION_USE_JCEKS=Path of a JCEKS containing a \ INFO_ARGUMENT_DESCRIPTION_USE_PKCS12=Path of a PKCS#12 key \ store containing the certificate that the server should use when accepting \ SSL-based connections or performing StartTLS negotiation -INFO_ARGUMENT_CERT_OPTION_JCEKS=Use an existing certificate located on a \ - JCEKS key store INFO_ARGUMENT_DESCRIPTION_CERT_NICKNAME=Nickname of the \ certificate that the server should use when accepting SSL-based \ connections or performing StartTLS negotiation @@ -666,8 +324,6 @@ ERR_SUBCMDPARSER_DUPLICATE_GLOBAL_ARG_LONG_ID=Failed to add global argument \ ERR_SUBCMDPARSER_GLOBAL_ARG_LONG_ID_CONFLICT=Failed to add argument %s to \ subcommand %s because there is already one argument with the same long identifier \ associated to this subcommand. -ERR_SUBCMDPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred \ - while attempting to read the contents of the argument properties file %s: %s ERR_SUBCMDPARSER_LONG_ARG_WITHOUT_NAME=The provided command-line \ argument %s does not contain an argument name ERR_SUBCMDPARSER_NO_GLOBAL_ARGUMENT_FOR_LONG_ID=The provided \ @@ -701,46 +357,11 @@ ERR_SUBCMDPARSER_CANT_MIX_ARGS_WITH_VALUES=The provided argument \ the same block as at least one other argument that does not require a value ERR_SUBCMDPARSER_INVALID_ARGUMENT=The provided argument "%s" is \ not recognized -ERR_SUBCMDPARSER_NO_VALUE_FOR_REQUIRED_ARG=The argument %s is \ - required to have a value but none was provided in the argument list and no \ - default value is available -ERR_ARGUMENT_NO_BASE_DN_SPECIFIED=You have specified \ - not to create a base DN. If no base DN is to be created you cannot specify \ - argument '%s' -ERR_PORT_ALREADY_SPECIFIED=ERROR: You have specified \ - the value %s for different ports -ERR_SEVERAL_CERTIFICATE_TYPE_SPECIFIED=You have \ - specified several certificate types to be used. Only one certificate type \ - is allowed -ERR_CERTIFICATE_REQUIRED_FOR_SSL_OR_STARTTLS=You have \ - chosen to enable SSL or StartTLS. You must specify which type of certificate \ - you want the server to use -ERR_TWO_CONFLICTING_ARGUMENTS=ERROR: You may not \ - provide both the %s and the %s arguments at the same time -ERR_NO_KEYSTORE_PASSWORD=You must provide the PIN of the \ - keystore to retrieve the certificate to be used by the server. You can use \ - {%s} or {%s} -ERR_SSL_OR_STARTTLS_REQUIRED=You have specified to use a \ - certificate as server certificate. You must enable SSL (using option {%s}) \ - or Start TLS (using option %s) -ERR_NO_ROOT_PASSWORD=ERROR: No password was provided \ - for the initial root user. When performing a non-interactive installation, \ - this must be provided using either the %s or the %s argument -INFO_BACKUPDB_DESCRIPTION_BACKEND_ID=Backend ID for the backend to \ - archive -INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL=Back up all backends in the server -INFO_SETUP_SUBCOMMAND_CREATE_DIRECTORY_SERVER=Can be used with global arguments \ -to setup a directory server -INFO_SETUP_SUBCOMMAND_CREATE_PROXY=Can be used with global arguments \ -to setup a proxy ERR_INCOMPATIBLE_JAVA_VERSION=The minimum Java version required is %s.%n%n\ The detected version is %s.%nThe binary detected is %s%n%nPlease set \ OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \ java.properties file and then run the dsjavaproperties script to specify the \ java version to be used. -INFO_INSTANCE_DIRECTORY=Instance Directory: %s -INFO_INSTALLATION_DIRECTORY=Installation Directory: %s -ERR_INVALID_LOG_FILE=Invalid log file %s INFO_DESCRIPTION_CONNECTION_TIMEOUT=Maximum length of time (in \ milliseconds) that can be taken to establish a connection. Use '0' to \ specify no time out @@ -788,14 +409,6 @@ INFO_CANNOT_CONNECT_TO_REMOTE_GENERIC=Could not connect to %s. Check that the \ server is running and that the provided credentials are valid.%nError \ details:%n%s ERR_CONFIRMATION_TRIES_LIMIT_REACHED=Confirmation tries limit reached (%d) -INFO_ADMINISTRATOR_UID_PROMPT=Global Administrator User ID -INFO_ADMINISTRATOR_PWD_PROMPT=Global Administrator Password: -INFO_ADMINISTRATOR_PWD_CONFIRM_PROMPT=Confirm Password: -ERR_ADMINISTRATOR_PWD_DO_NOT_MATCH=The provided passwords do not match. -ERR_BAD_INTEGER=Invalid integer number "%s". Please enter a valid integer -INFO_DESCRIPTION_BATCH=Reads from standard input a set of commands to be executed -INFO_DESCRIPTION_BATCH_FILE_PATH=Path to a batch file containing \ -a set of commands to be executed INFO_DESCRIPTION_DISPLAY_EQUIVALENT=Display the equivalent \ non-interactive argument in the standard output when this command is run in \ interactive mode @@ -808,103 +421,16 @@ INFO_DESCRIPTION_CONFIG_CLASS=The fully-qualified name of the Java class \ will be used INFO_DESCRIPTION_CONFIG_FILE=Path to the Directory Server \ configuration file -INFO_DESCRIPTION_BACKUP_ID=Use the provided identifier for the \ - backup -INFO_DESCRIPTION_BACKUP_DIR=Path to the target directory for the \ - backup file(s) -INFO_DESCRIPTION_KEYMANAGER_PROVIDER_DN=DN of the \ - key manager provider to use for SSL and/or StartTLS -INFO_DESCRIPTION_TRUSTMANAGER_PROVIDER_DN=DN of \ - the trust manager provider to use for SSL and/or StartTLS -INFO_DESCRIPTION_KEYMANAGER_PATH=Path of the \ - key store to be used by the key manager provider -INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_DISABLE=Disables the server as \ - a Windows service and stops the server -INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_STATE=Provides information \ - about the state of the server as a Windows service -INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP=Allows to disable the \ - server service and to clean up the windows registry information associated \ - with the provided service name -INFO_COMPARE_DESCRIPTION_FILENAME=File containing the DNs of the entries \ - to compare -INFO_DESCRIPTION_USE_SASL_EXTERNAL=Use the SASL EXTERNAL authentication \ - mechanism -INFO_DELETE_DESCRIPTION_FILENAME=File containing the DNs of the entries \ - to delete -INFO_DESCRIPTION_TIME_LIMIT=Maximum length of \ - time (in seconds) to spend processing -INFO_DESCRIPTION_IMPORTLDIF=Path to an LDIF file \ - containing data that should be added to the Directory Server database. \ - Multiple LDIF files may be provided by using this option multiple times INFO_LDAPAUTH_PASSWORD_PROMPT=Password for user '%s': -INFO_DESCRIPTION_ADMIN_UID=User ID of the Global Administrator \ - to use to bind to the server # # Uninstall messages # -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_ALL=Remove all components of \ - the server (this option is not compatible with the rest of remove options) -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_SERVER_LIBRARIES=Remove Server Libraries \ - and Administrative Tools -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_DATABASES=Remove database contents -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LOG_FILES=Remove log files -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_CONFIGURATION_FILES=Remove configuration \ - files -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_BACKUP_FILES=Remove backup files -INFO_UNINSTALLDS_DESCRIPTION_REMOVE_LDIF_FILES=Remove LDIF files -INFO_DESCRIPTION_REFERENCED_HOST=The name of this host (or IP address) as \ - it is referenced in remote servers for replication -INFO_UNINSTALLDS_DESCRIPTION_FORCE=Specifies whether the uninstall should \ - continue if there is an error updating references to this server in remote \ - server instances or not. This option can only be used with the %s no \ - prompt option. # # Connection messages # -ERR_FAILED_TO_CONNECT=Unable to connect to the server at "%s" on port %s -ERR_SIMPLE_BIND_NOT_SUPPORTED=Unable to authenticate using simple \ -authentication -ERR_FAILED_TO_CONNECT_WRONG_PORT=Unable to connect to the \ - server at %s on port %s. Check this port is an administration port -ERR_CANNOT_BIND_TO_PRIVILEGED_PORT=ERROR: Unable to \ - bind to port %d. This port may already be in use, or you may not have \ - permission to bind to it. On UNIX-based operating systems, non-root users \ - may not be allowed to bind to ports 1 through 1024 -ERR_CANNOT_BIND_TO_PORT=ERROR: Unable to bind to port \ - %d. This port may already be in use, or you may not have permission to bind \ - to it -ERR_FAILED_TO_CONNECT_NOT_TRUSTED=Unable to connect to the \ - server at %s on port %s. In non-interactive mode, if the trustStore related parameters are not used, \ - you must use the '--trustAll' option for remote connections INFO_EXCEPTION_OUT_OF_MEMORY_DETAILS=Not enough memory to perform the \ operation. Details: %s INFO_EXCEPTION_DETAILS=Details: %s -INFO_LDAP_CONN_PROMPT_SECURITY_LDAP=LDAP -INFO_LDAP_CONN_PROMPT_SECURITY_USE_SSL=LDAP with SSL -INFO_LDAP_CONN_PROMPT_SECURITY_USE_START_TLS=LDAP with StartTLS -INFO_LDAP_CONN_PROMPT_SECURITY_USE_TRUST_ALL=Automatically \ - trust -INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PATH=Truststore path: -INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE_PASSWORD=Password for \ - truststore '%s': -INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PATH=Keystore path: -INFO_LDAP_CONN_PROMPT_SECURITY_KEYSTORE_PASSWORD=Password for keystore \ - '%s': -INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS=>>>> Specify OpenDJ LDAP \ - connection parameters -ERR_LDAP_CONN_BAD_HOST_NAME=The hostname "%s" could not be \ - resolved. Please check you have provided the correct address -ERR_LDAP_CONN_BAD_PORT_NUMBER=Invalid port number "%s". Please \ - enter a valid port number between 1 and 65535 -INFO_LDAP_CONN_PROMPT_HOST_NAME=Directory server hostname or IP address \ - [%s]: -INFO_LDAP_CONN_PROMPT_SECURITY_USE_SECURE_CTX=How do you want to connect? -INFO_LDAP_CONN_PROMPT_SECURITY_PROTOCOL_DEFAULT_CHOICE=%d -ERR_LDAP_CONN_PROMPT_SECURITY_INVALID_FILE_PATH=The provided path \ - is not valid -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_METHOD=How do you want to trust the server certificate? -INFO_LDAP_CONN_PROMPT_SECURITY_TRUSTSTORE=Use a truststore -INFO_LDAP_CONN_PROMPT_SECURITY_MANUAL_CHECK=Manually validate INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate: INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate? @@ -915,38 +441,6 @@ INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS=View certificate details INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN : %s INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n To '%s' INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer : %s -INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_ALIASES=Which certificate do you want to use? -INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_ALIAS=%s (%s) -INFO_LDAP_CONN_PROMPT_ADMINISTRATOR_UID=Global Administrator User ID [%s]: -INFO_LDAP_CONN_GLOBAL_ADMINISTRATOR_OR_BINDDN_PROMPT=Global Administrator \ - User ID, or bind DN if no Global Administrator is defined [%s]: -INFO_LDAP_CONN_PROMPT_PORT_NUMBER=Directory server port number [%d]: -INFO_LDAP_CONN_PROMPT_BIND_DN=Administrator user bind DN [%s]: -INFO_ADMIN_CONN_PROMPT_PORT_NUMBER=Directory server administration port number [%d]: -INFO_ERROR_CONNECTING_TO_LOCAL=An error occurred connecting to the server -INFO_CERTIFICATE_NOT_TRUSTED_TEXT_CLI=The Certificate presented by the server \ - %s:%s could not be trusted.\nPossible reasons for this error:\n\ - -The Certificate Authority that issued the certificate is not recognized (this \ - is the case of the self-signed certificates).\n-The server's certificate is \ - incomplete due to a misconfiguration.\n-The server's certificate has \ - expired.\n-There is a time difference between the server machine clock and \ - the local machine clock.\nBefore accepting this certificate, you should \ - examine the server's certificate carefully. -INFO_CERTIFICATE_NAME_MISMATCH_TEXT_CLI=The Certificate presented by the server \ - %s:%s could not be trusted.\nThere is a name mismatch between the name of \ - the server (%s) and the subject DN of the certificate. This could be caused \ - because you are connected to a server pretending to be %s:%s.\n\ - Before accepting this certificate, you should examine the server's \ - certificate carefully. -ERR_ERROR_CANNOT_READ_CONNECTION_PARAMETERS=The connection \ - parameters could not be read due to the following error: %s -ERR_ERROR_NO_ADMIN_PASSWORD=No password was specified for \ - administrator "%s" -ERR_ERROR_BIND_PASSWORD_NONINTERACTIVE=The LDAP bind \ - password was not specified and cannot be read interactively -ERR_ERROR_INCOMPATIBLE_PROPERTY_MOD=The property \ - modification "%s" is incompatible with another modification to the same \ - property INFO_LDAP_CONN_HEADING_CONNECTION_PARAMETERS=>>>> Specify OpenDJ LDAP \ connection parameters ERR_ERROR_CANNOT_READ_PASSWORD=Unable to read password @@ -962,7 +456,6 @@ REF_TITLE_SUBCOMMANDS=Subcommands REF_INTRO_SUBCOMMANDS=The %s command supports the following subcommands: REF_PART_TITLE_SUBCOMMANDS=%s Subcommands Reference REF_PART_INTRO_SUBCOMMANDS=This section covers %s subcommands. -REF_SHORT_DESC_UNINSTALL=remove OpenDJ directory server software REF_DEFAULT_BACKEND_TYPE=Depends on the distribution # Supplements to descriptions for generated reference documentation. diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java index 79f26e13e..863fa2bda 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/TestSubCommandArgumentParserTestCase.java @@ -12,12 +12,10 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; -import static com.forgerock.opendj.cli.CliMessages.*; - import java.util.ArrayList; import java.util.List; @@ -51,9 +49,9 @@ public final class TestSubCommandArgumentParserTestCase extends CliTestCase { public void setup() throws Exception { parser = new SubCommandArgumentParser(getClass().getName(), LocalizableMessage.raw("test description"), true); - sc1 = new SubCommand(parser, "sub-command1", INFO_BACKUPDB_DESCRIPTION_BACKEND_ID.get()); + sc1 = new SubCommand(parser, "sub-command1", LocalizableMessage.raw("sub-command1")); sc2 = new SubCommand(parser, "sub-command2", true, 2, 4, "args1 arg2 [arg3 arg4]", - INFO_BACKUPDB_DESCRIPTION_BACKUP_ALL.get()); + LocalizableMessage.raw("sub-command2")); } /** diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 19d586ba2..44a2bc0df 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -12,8 +12,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2010 Sun Microsystems, Inc. -# Portions copyright 2011-2015 ForgeRock AS. +# Portions copyright 2011-2016 ForgeRock AS. # Portions Copyright 2014 Manuel Gaupp + ERR_ATTR_SYNTAX_UNKNOWN_APPROXIMATE_MATCHING_RULE=Unable to retrieve \ approximate matching rule %s used as the default for the %s attribute syntax. \ Approximate matching will not be allowed by default for attributes with this \ @@ -1498,30 +1499,12 @@ ERR_ENTRY_GENERATOR_CANNOT_DECODE_BRANCH_DN=Unable to decode branch DN "%s" \ ERR_ENTRY_GENERATOR_UNDEFINED_BRANCH_SUBORDINATE=The branch with entry DN \ '%s' references a subordinate template named '%s' which is not defined in the \ template file -ERR_ENTRY_GENERATOR_SUBORDINATE_TEMPLATE_NO_COLON=Subordinate \ - template definition on line %d for %s %s is missing a colon to separate \ - the template name from the number of entries -ERR_ENTRY_GENERATOR_SUBORDINATE_INVALID_NUM_ENTRIES=Subordinate \ - template definition on line %d for %s %s specified invalid number of \ - entries %d for template %s WARN_ENTRY_GENERATOR_SUBORDINATE_ZERO_ENTRIES=Subordinate template \ definition on line %d for %s %s specifies that zero entries of type %s \ should be generated ERR_ENTRY_GENERATOR_SUBORDINATE_CANT_PARSE_NUMENTRIES=Unable to \ parse the number of entries for template %s as an integer for the subordinate \ template definition on line %d for %s %s -ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_TEMPLATE_NO_COLON=Subordinate \ - template definition on line %d for template %s is missing a colon to separate \ - the template name from the number of entries -ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_INVALID_NUM_ENTRIES=Subordinate \ - template definition on line %d for template %s specified invalid number of \ - entries %d for subordinate template %s -WARN_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_ZERO_ENTRIES=Subordinate template \ - definition on line %d for template %s specifies that zero entries of type %s \ - should be generated -ERR_ENTRY_GENERATOR_TEMPLATE_SUBORDINATE_CANT_PARSE_NUMENTRIES=Unable to \ - parse the number of entries for template %s as an integer for the subordinate \ - template definition on line %d for template %s ERR_ENTRY_GENERATOR_TEMPLATE_MISSING_RDN_ATTR=The template named %s \ includes RDN attribute %s that is not assigned a value in that template ERR_ENTRY_GENERATOR_NO_COLON_IN_TEMPLATE_LINE=There is no colon to separate \ @@ -1572,11 +1555,8 @@ WARN_ENTRY_GENERATOR_TAG_LIST_INVALID_WEIGHT=The list tag on line %d of \ semicolon is not followed by an integer. The semicolon will be assumed to be \ part of the value and not a delimiter to separate the value from its relative \ weight -ERR_ENTRY_GENERATOR_IOEXCEPTION_DURING_PARSE=An error occurred while \ - attempting to read the template file: %s ERR_ENTRY_GENERATOR_EXCEPTION_DURING_PARSE=An error occurred while \ attempting to parse the template file: %s -ERR_ENTRY_GENERATOR_MISSING_TEMPLATE_FILE=Unexpected error when initializing config : no template file provided as input ERR_ADDRESSMASK_PREFIX_DECODE_ERROR=Cannot decode the provided \ address mask prefix because an invalid value was specified. The permitted \ values for IPv4are 0 to32 and for IPv6 0 to128 diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java index 5eadde054..95327e016 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java @@ -16,7 +16,6 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.MultiColumnPrinter.column; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER; import static java.util.concurrent.TimeUnit.*; import static com.forgerock.opendj.cli.CommonArguments.*; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java index 7d7f2f8a8..f422b24d4 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java @@ -17,8 +17,6 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER; -import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_CURRENTPWFILE; -import static com.forgerock.opendj.cli.CliMessages.INFO_LDAPPWMOD_DESCRIPTION_NEWPWFILE; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.CommonArguments.*; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index c2a07741d..e7a6dfb08 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -73,12 +73,7 @@ import com.forgerock.opendj.ldap.controls.AccountUsabilityResponseControl; import com.forgerock.opendj.util.StaticUtils; -import static com.forgerock.opendj.cli.CliMessages.INFO_DESCRIPTION_SIMPLE_PAGE_SIZE; import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT; -import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER; -import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults; import static org.forgerock.util.Utils.*; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java index 3be968557..9dac709f3 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java @@ -16,10 +16,6 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_SIZE_LIMIT; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEARCH_DESCRIPTION_TIME_LIMIT; -import static com.forgerock.opendj.cli.CliMessages.INFO_SIZE_LIMIT_PLACEHOLDER; -import static com.forgerock.opendj.cli.CliMessages.INFO_TIME_LIMIT_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.CommonArguments.*; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java index 9593e318e..a99367577 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java @@ -17,8 +17,6 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; -import static com.forgerock.opendj.cli.CliMessages.INFO_MAKELDIF_DESCRIPTION_SEED; -import static com.forgerock.opendj.cli.CliMessages.INFO_SEED_PLACEHOLDER; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties index 25b2e75ad..ad61aba17 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties @@ -14,127 +14,7 @@ # Copyright 2010 Sun Microsystems, Inc. # Portions copyright 2012-2016 ForgeRock AS. -# -# Utility messages -# -ERR_ARG_NO_IDENTIFIER=The %s argument does not have either a \ - single-character or a long identifier that may be used to specify it. At \ - least one of these must be specified for each argument -ERR_ARG_NO_VALUE_PLACEHOLDER=The %s argument is configured to take \ - a value but no value placeholder has been defined for it -ERR_ARG_NO_INT_VALUE=The %s argument does not have any value that \ - may be retrieved as an integer -ERR_ARG_CANNOT_DECODE_AS_INT=The provided value "%s" for the %s \ - argument cannot be decoded as an integer -ERR_ARG_INT_MULTIPLE_VALUES=The %s argument has multiple values and \ - therefore cannot be decoded as a single integer value -ERR_ARG_NO_BOOLEAN_VALUE=The %s argument does not have any value \ - that may be retrieved as a Boolean -ERR_ARG_CANNOT_DECODE_AS_BOOLEAN=The provided value "%s" for the %s \ - argument cannot be decoded as a Boolean -ERR_ARG_BOOLEAN_MULTIPLE_VALUES=The %s argument has multiple values \ - and therefore cannot be decoded as a single Boolean value -ERR_INTARG_LOWER_BOUND_ABOVE_UPPER_BOUND=The %s argument \ - configuration is invalid because the lower bound of %d is greater than the \ - upper bound of %d -ERR_INTARG_VALUE_BELOW_LOWER_BOUND=The provided %s value %d is \ - unacceptable because it is below the lower bound of %d -ERR_INTARG_VALUE_ABOVE_UPPER_BOUND=The provided %s value %d is \ - unacceptable because it is above the upper bound of %d -ERR_BOOLEANARG_NO_VALUE_ALLOWED=The provided %s value is \ - unacceptable because Boolean arguments are never allowed to have values -ERR_MCARG_VALUE_NOT_ALLOWED=The provided %s value %s is \ - unacceptable because it is not included in the set of allowed values for that \ - argument -ERR_FILEARG_NO_SUCH_FILE=The file %s specified for argument %s does \ - not exist -ERR_FILEARG_CANNOT_VERIFY_FILE_EXISTENCE=An error occurred while \ - trying to verify the existence of file %s specified for argument %s: %s -ERR_FILEARG_CANNOT_OPEN_FILE=An error occurred while trying to open \ - file %s specified for argument %s for reading: %s -ERR_FILEARG_CANNOT_READ_FILE=An error occurred while trying to read \ - from file %s specified for argument %s: %s -ERR_FILEARG_EMPTY_FILE=The file %s specified for argument %s exists \ - but is empty -ERR_ARGPARSER_DUPLICATE_SHORT_ID=Cannot add argument %s to the \ - argument list because its short identifier -%s conflicts with the %s argument \ - that has already been defined -ERR_ARGPARSER_DUPLICATE_LONG_ID=Cannot add argument %s to the \ - argument list because its long identifier --%s conflicts with the %s argument \ - that has already been defined -ERR_ARGPARSER_CANNOT_READ_PROPERTIES_FILE=An error occurred while \ - attempting to read the contents of the argument properties file %s: %s -ERR_ARGPARSER_TOO_MANY_TRAILING_ARGS=The provided set of \ - command-line arguments contained too many unnamed trailing arguments. The \ - maximum number of allowed trailing arguments is %d -ERR_ARGPARSER_LONG_ARG_WITHOUT_NAME=The provided argument "%s" is \ - invalid because it does not include the argument name -ERR_ARGPARSER_NO_ARGUMENT_WITH_LONG_ID=Argument --%s is not allowed \ - for use with this program -ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_LONG_ID=Argument --%s \ - requires a value but none was provided -ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_LONG_ID=The provided value \ - "%s" for argument --%s is not acceptable: %s -ERR_ARGPARSER_NOT_MULTIVALUED_FOR_LONG_ID=The argument --%s was \ - included multiple times in the provided set of arguments but it does not \ - allow multiple values -ERR_ARGPARSER_ARG_FOR_LONG_ID_DOESNT_TAKE_VALUE=A value was \ - provided for argument --%s but that argument does not take a value -ERR_ARGPARSER_INVALID_DASH_AS_ARGUMENT=The dash character by itself \ - is invalid for use as an argument name -ERR_ARGPARSER_NO_ARGUMENT_WITH_SHORT_ID=Argument -%s is not allowed \ - for use with this program -ERR_ARGPARSER_NO_VALUE_FOR_ARGUMENT_WITH_SHORT_ID=Argument -%s \ - requires a value but none was provided -ERR_ARGPARSER_VALUE_UNACCEPTABLE_FOR_SHORT_ID=The provided value \ - "%s" for argument -%s is not acceptable: %s -ERR_ARGPARSER_NOT_MULTIVALUED_FOR_SHORT_ID=The argument -%s was \ - included multiple times in the provided set of arguments but it does not \ - allow multiple values -ERR_ARGPARSER_CANT_MIX_ARGS_WITH_VALUES=The provided argument block \ - '-%s%s' is illegal because the '%s' argument requires a value but is in the \ - same block as at least one other argument that doesn't require a value -ERR_ARGPARSER_DISALLOWED_TRAILING_ARGUMENT=Argument "%s" does not \ - start with one or two dashes and unnamed trailing arguments are not allowed -ERR_ARGPARSER_TOO_FEW_TRAILING_ARGUMENTS=At least %d unnamed \ - trailing arguments are required in the argument list, but too few were \ - provided -ERR_ARGPARSER_NO_VALUE_FOR_REQUIRED_ARG=The argument %s is required \ - to have a value but none was provided in the argument list and no default \ - value is available -INFO_TIME_IN_SECONDS=%d seconds -INFO_TIME_IN_MINUTES_SECONDS=%d minutes, %d seconds -INFO_TIME_IN_HOURS_MINUTES_SECONDS=%d hours, %d minutes, %d seconds -INFO_TIME_IN_DAYS_HOURS_MINUTES_SECONDS=%d days, %d hours, %d minutes, %d \ - seconds -INFO_SUBCMDPARSER_WHERE_OPTIONS_INCLUDE=Command options: -ERR_MENU_BAD_CHOICE_SINGLE=Invalid response. Please enter a valid \ -menu option -INFO_MENU_PROMPT_SINGLE=Enter choice: -INFO_MENU_PROMPT_RETURN_TO_CONTINUE=Press RETURN to continue -ERR_CONSOLE_INPUT_ERROR=The response could not be read from the console due to the following error: %s -INFO_LDAP_CONN_PROMPT_SECURITY_SERVER_CERTIFICATE=Server Certificate: -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE=%s -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION=Do you trust this server certificate? -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_NO=No -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_SESSION=Yes, for this session only -INFO_LDAP_CONN_PROMPT_SECURITY_TRUST_OPTION_ALWAYS=Yes, also add it to a truststore -INFO_LDAP_CONN_PROMPT_SECURITY_CERTIFICATE_DETAILS=View certificate details -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_USER_DN=User DN : %s -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_VALIDITY=Validity : From '%s'%n To '%s' -INFO_LDAP_CONN_SECURITY_SERVER_CERTIFICATE_ISSUER=Issuer : %s -INFO_PROMPT_SINGLE_DEFAULT=%s [%s]: -INFO_ARGPARSER_USAGE_JAVA_CLASSNAME=Usage: java %s {options} -INFO_ARGPARSER_USAGE_JAVA_SCRIPTNAME=Usage: %s {options} -INFO_ARGPARSER_USAGE_TRAILINGARGS={trailing-arguments} -INFO_ARGPARSER_USAGE_DEFAULT_VALUE=Default value: %s ERROR_RATE_TOOLS_CANNOT_GET_CONNECTION=%s\nStopping... -# -# Extension messages -# -# -# Tools messages -# ERR_CANNOT_INITIALIZE_ARGS=An unexpected error occurred while \ attempting to initialize the command-line arguments: %s ERR_ERROR_PARSING_ARGS=An error occurred while parsing the \ @@ -148,50 +28,19 @@ INFO_COMPARE_OPERATION_RESULT_FALSE=Compare operation returned false for \ entry %s INFO_COMPARE_OPERATION_RESULT_TRUE=Compare operation returned true for \ entry %s -INFO_DESCRIPTION_TRUSTALL=Trust all server SSL certificates -INFO_DESCRIPTION_BINDDN=DN to use to bind to the server -INFO_DESCRIPTION_BINDPASSWORD=Password to use to bind to \ - the server -INFO_DESCRIPTION_BINDPASSWORDFILE=Bind password file -INFO_DESCRIPTION_ENCODING=Use the specified character set for \ - command-line input -INFO_DESCRIPTION_VERBOSE=Use verbose mode -INFO_DESCRIPTION_KEYSTOREPATH=Certificate key store path -INFO_DESCRIPTION_TRUSTSTOREPATH=Certificate trust store path -INFO_DESCRIPTION_KEYSTOREPASSWORD=Certificate key store PIN -INFO_DESCRIPTION_HOST=Directory server hostname or IP address -INFO_DESCRIPTION_PORT=Directory server port number -INFO_DESCRIPTION_SHOWUSAGE=Display this usage information INFO_DESCRIPTION_CONTROLS=Use a request control with the provided \ information -INFO_DESCRIPTION_CONTINUE_ON_ERROR=Continue processing even if there are \ - errors -INFO_DESCRIPTION_USE_SSL=Use SSL for secure communication with the server -INFO_DESCRIPTION_START_TLS=Use StartTLS to secure communication with the \ - server -INFO_MODIFY_DESCRIPTION_DEFAULT_ADD=Treat records with no changetype as \ - add operations INFO_SEARCH_DESCRIPTION_BASEDN=Search base DN INFO_SEARCH_DESCRIPTION_SIZE_LIMIT=Maximum number of entries to return \ from the search INFO_SEARCH_DESCRIPTION_TIME_LIMIT=Maximum length of time in seconds to \ allow for the search -INFO_SEARCH_DESCRIPTION_SEARCH_SCOPE=Search scope ('base', 'one', 'sub', \ - or 'subordinate'). Note: 'subordinate' is an LDAP extension \ - that might not work with all LDAP servers INFO_SEARCH_DESCRIPTION_DEREFERENCE_POLICY=Alias dereference policy \ ('never', 'always', 'search', or 'find') -ERR_LDAPAUTH_UNSUPPORTED_SASL_MECHANISM=The requested SASL mechanism \ - "%s" is not supported by this client -ERR_LDAPAUTH_SASL_AUTHID_REQUIRED=The "authid" SASL property is \ - required for use with the %s mechanism -INFO_DESCRIPTION_VERSION=LDAP protocol version number ERR_DESCRIPTION_INVALID_VERSION=Invalid LDAP version number '%s'. \ Allowed values are 2 and 3 ERR_SEARCH_NO_FILTERS=No filters specified for the search request INFO_DESCRIPTION_DONT_WRAP=Do not wrap long lines -INFO_DESCRIPTION_NOOP=Show what would be done but do not perform any \ - operation INFO_DESCRIPTION_TYPES_ONLY=Only retrieve attribute names but not their \ values INFO_DESCRIPTION_ASSERTION_FILTER=Use the LDAP assertion control with the \ @@ -221,7 +70,6 @@ ERR_PSEARCH_INVALID_RETURN_ECS=The provided returnECs value %s is \ invalid. Allowed values are 1 to request that the entry change notification \ control be included in updated entries, or 0 to exclude the control from \ matching entries -INFO_DESCRIPTION_REPORT_AUTHZID=Use the authorization identity control INFO_BIND_AUTHZID_RETURNED=# Bound with authorization ID %s INFO_SEARCH_DESCRIPTION_FILENAME=File containing a list of search filter \ strings @@ -241,7 +89,6 @@ INFO_BIND_ACCOUNT_LOCKED=# Your account has been locked INFO_BIND_MUST_CHANGE_PASSWORD=# You must change your password before any \ other operations will be allowed INFO_BIND_GRACE_LOGINS_REMAINING=# You have %d grace logins remaining -INFO_DESCRIPTION_USE_PWP_CONTROL=Use the password policy request control INFO_LDAPPWMOD_DESCRIPTION_AUTHZID=Authorization ID for the \ user entry whose password should be changed. \ The authorization ID is a string having either \ @@ -286,18 +133,12 @@ INFO_LDAPPWMOD_TOOL_DESCRIPTION=This utility can be used to perform LDAP \ password modify operations in the Directory Server INFO_LDAPSEARCH_TOOL_DESCRIPTION=This utility can be used to perform LDAP \ search operations in the Directory Server -ERR_TOOL_CONFLICTING_ARGS=You may not provide both the --%s and \ - the --%s arguments ERR_LDAPCOMPARE_NO_ATTR=No attribute was specified to use as the \ target for the comparison ERR_LDAPCOMPARE_INVALID_ATTR_STRING=Invalid attribute string '%s'. \ The attribute string must be in one of the following forms: \ 'attribute:value', 'attribute::base64value', or 'attribute: Date: Tue, 1 Mar 2016 10:03:55 +0100 Subject: [PATCH 063/125] ConnectionFactoryProvider.java: remove code duplication --- .../opendj/cli/ConnectionFactoryProvider.java | 77 +++++++------------ 1 file changed, 28 insertions(+), 49 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index 3a1f658bb..39cf4343d 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -529,13 +529,7 @@ private boolean canReadPath(final String path) { } private String getAuthID(final String mech) throws ArgumentException { - String value = null; - for (final String s : saslOptionArg.getValues()) { - if (s.startsWith(SASL_PROPERTY_AUTHID)) { - value = parseSASLOptionValue(s); - break; - } - } + String value = getAuthID(); if (value == null && bindNameArg.isPresent()) { value = "dn: " + bindNameArg.getValue(); } @@ -551,21 +545,17 @@ private String getAuthID(final String mech) throws ArgumentException { } } if (value == null) { - final LocalizableMessage message = ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(mech); - throw new ArgumentException(message); + throw new ArgumentException(ERR_LDAPAUTH_SASL_AUTHID_REQUIRED.get(mech)); } return value; } + private String getAuthID() throws ArgumentException { + return getSaslProperty(SASL_PROPERTY_AUTHID); + } + private String getAuthzID() throws ArgumentException { - String value = null; - for (final String s : saslOptionArg.getValues()) { - if (s.startsWith(SASL_PROPERTY_AUTHZID)) { - value = parseSASLOptionValue(s); - break; - } - } - return value; + return getSaslProperty(SASL_PROPERTY_AUTHZID); } /** @@ -611,13 +601,7 @@ public String getBindName() throws ArgumentException { */ public BindRequest getBindRequest() throws ArgumentException { if (bindRequest == null) { - String mech = null; - for (final String s : saslOptionArg.getValues()) { - if (s.startsWith(SASL_PROPERTY_MECH)) { - mech = parseSASLOptionValue(s); - break; - } - } + String mech = getMechanism(); if (mech == null) { if (bindNameArg.isPresent() || bindPasswordFileArg.isPresent() @@ -672,21 +656,30 @@ public BindRequest getBindRequest() throws ArgumentException { return bindRequest; } - /** {@inheritDoc} */ - @Override - public String toString() { - return connFactory.toString(); + private String getMechanism() throws ArgumentException { + return getSaslProperty(SASL_PROPERTY_MECH); } private String getKDC() throws ArgumentException { - String value = null; + return getSaslProperty(SASL_PROPERTY_KDC); + } + + private String getRealm() throws ArgumentException { + return getSaslProperty(SASL_PROPERTY_REALM); + } + + private String getSaslProperty(String propertyName) throws ArgumentException { for (final String s : saslOptionArg.getValues()) { - if (s.startsWith(SASL_PROPERTY_KDC)) { - value = parseSASLOptionValue(s); - break; + if (s.startsWith(propertyName)) { + return parseSASLOptionValue(s); } } - return value; + return null; + } + + @Override + public String toString() { + return connFactory.toString(); } /** @@ -797,17 +790,6 @@ public char[] getPassword() throws ArgumentException { return value; } - private String getRealm() throws ArgumentException { - String value = null; - for (final String s : saslOptionArg.getValues()) { - if (s.startsWith(SASL_PROPERTY_REALM)) { - value = parseSASLOptionValue(s); - break; - } - } - return value; - } - /** * Retrieves a TrustManager object that may be used for * interactions requiring access to a trust manager. @@ -855,7 +837,6 @@ private String getTrustStore() { * * @return The PIN that should be used to access the trust store, can be null. */ - private char[] getTrustStorePIN() { String pwd; if (trustStorePasswordArg.isPresent()) { @@ -870,11 +851,9 @@ private char[] getTrustStorePIN() { private String parseSASLOptionValue(final String option) throws ArgumentException { final int equalPos = option.indexOf('='); - if (equalPos <= 0) { - final LocalizableMessage message = ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION.get(option); - throw new ArgumentException(message); + if (equalPos == -1) { + throw new ArgumentException(ERR_LDAP_CONN_CANNOT_PARSE_SASL_OPTION.get(option)); } - return option.substring(equalPos + 1, option.length()); } From 211bbd8fc34a5d2ff83e6ee661e448b4249bebba Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 15 Feb 2016 17:35:28 +0100 Subject: [PATCH 064/125] OPENDJ-2701 status command using -n fails if no password is provided Changes needed for refactoring in server. * Moves user validation input for port number in Utils to allow server code to use it. * Little enhancements in CommandBuilder and in CommonsArguments --- .../forgerock/opendj/cli/CommandBuilder.java | 18 ++++++++++ .../forgerock/opendj/cli/CommonArguments.java | 20 ++++++++++- .../opendj/cli/ConsoleApplication.java | 26 +-------------- .../java/com/forgerock/opendj/cli/Utils.java | 33 +++++++++++++++++++ 4 files changed, 71 insertions(+), 26 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java index 2e2cfb8e5..6f379e84c 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommandBuilder.java @@ -60,6 +60,11 @@ public class CommandBuilder { } } + /** Creates a {@link CommandBuilder} with {@code null} command and subcommand names. */ + public CommandBuilder() { + this(null, null); + } + /** * The constructor for the CommandBuilder. * @@ -110,6 +115,19 @@ public boolean removeArgument(final Argument argument) { return args.remove(argument); } + /** + * Removes the provided arguments from this CommandBuilder. + * Arguments which are not in this {@link CommandBuilder} will be ignored. + * + * @param arguments + * Arguments to be removed. + */ + public void removeArguments(final Argument... arguments) { + for (final Argument argument : arguments) { + removeArgument(argument); + } + } + /** * Appends the arguments of another command builder to this command builder. * diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java index 63f0a7d02..ce34201d1 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java @@ -418,9 +418,27 @@ public static StringArgument baseDNArgument() throws ArgumentException { * If there is a problem with any of the parameters used to create this argument. */ public static StringArgument bindDNArgument(final String defaultBindDN) throws ArgumentException { + return bindDNArgument(defaultBindDN, INFO_DESCRIPTION_BINDDN.get()); + } + + + /** + * Returns the "bindDN" string argument.
+ * N.B : the 'D' short option is also used by rootUserDN. + * + * @param defaultBindDN + * The default bind DN. + * @param description + * The localized description to print in help messages. + * @return The "bindDN" argument. + * @throws ArgumentException + * If there is a problem with any of the parameters used to create this argument. + */ + public static StringArgument bindDNArgument(final String defaultBindDN, final LocalizableMessage description) + throws ArgumentException { return StringArgument.builder(OPTION_LONG_BINDDN) .shortIdentifier(OPTION_SHORT_BINDDN) - .description(INFO_DESCRIPTION_BINDDN.get()) + .description(description) .defaultValue(defaultBindDN) .valuePlaceholder(INFO_BINDDN_PLACEHOLDER.get()) .buildArgument(); diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java index 6384a435d..3e22ef74f 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConsoleApplication.java @@ -556,35 +556,11 @@ public final String readLineOfInput(final LocalizableMessage prompt) throws Clie * If the port could not be retrieved for some reason. */ public final int readPort(LocalizableMessage prompt, final int defaultValue) throws ClientException { - final ValidationCallback callback = new ValidationCallback() { - @Override - public Integer validate(ConsoleApplication app, String input) throws ClientException { - final String ninput = input.trim(); - if (ninput.length() == 0) { - return defaultValue; - } - - try { - int i = Integer.parseInt(ninput); - if (i < 1 || i > 65535) { - throw new NumberFormatException(); - } - return i; - } catch (NumberFormatException e) { - // Try again... - app.println(); - app.println(ERR_BAD_PORT_NUMBER.get(ninput)); - app.println(); - return null; - } - } - - }; if (defaultValue != -1) { prompt = INFO_PROMPT_SINGLE_DEFAULT.get(prompt, defaultValue); } - return readValidatedInput(prompt, callback, CONFIRMATION_MAX_TRIES); + return readValidatedInput(prompt, Utils.portValidationCallback(defaultValue), CONFIRMATION_MAX_TRIES); } /** diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java index aa8c578b5..5d6cf7d54 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java @@ -625,4 +625,37 @@ public static String repeat(final char charToRepeat, final int length) { Arrays.fill(str, charToRepeat); return new String(str); } + + /** + * Return a {@link ValidationCallback} which can be used to validate a port number. + * + * @param defaultPort + * The default value to suggest to the user. + * @return a {@link ValidationCallback} which can be used to validate a port number. + */ + public static ValidationCallback portValidationCallback(final int defaultPort) { + return new ValidationCallback() { + @Override + public Integer validate(ConsoleApplication app, String rawInput) throws ClientException { + final String input = rawInput.trim(); + if (input.length() == 0) { + return defaultPort; + } + + try { + int i = Integer.parseInt(input); + if (i < 1 || i > 65535) { + throw new NumberFormatException(); + } + return i; + } catch (NumberFormatException e) { + // Try again... + app.println(); + app.println(ERR_BAD_PORT_NUMBER.get(input)); + app.println(); + return null; + } + } + }; + } } From c1dcd59e51310a687c18892ef089d0c6611a8931 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 25 Feb 2016 17:07:02 +0100 Subject: [PATCH 065/125] Add cli message resource bundle * Add resource bundle for locales: ca_ES, de, es, fr, ja, ko, pl, zh_CN, zh_TW. * For each locales, add the translation of ERR_TOOL_CONFLICTING_ARGS message --- .../forgerock/opendj/cli/cli_ca_ES.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_de.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_es.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_fr.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_ja.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_ko.properties | 17 +++++++++++++++++ .../com/forgerock/opendj/cli/cli_pl.properties | 17 +++++++++++++++++ .../forgerock/opendj/cli/cli_zh_CN.properties | 17 +++++++++++++++++ .../forgerock/opendj/cli/cli_zh_TW.properties | 17 +++++++++++++++++ 9 files changed, 153 insertions(+) create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ca_ES.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_de.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_es.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_fr.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ja.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ko.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_pl.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_CN.properties create mode 100644 opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_TW.properties diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ca_ES.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ca_ES.properties new file mode 100644 index 000000000..c3458b9dc --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ca_ES.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=ERROR: Potser nou heu introdu\u00eft ambd\u00f3s arguments %s i %s al mateix cop diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_de.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_de.properties new file mode 100644 index 000000000..cc8cb1b42 --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_de.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=Sie haben m\u00f6glicherweise nicht beide Argumente --%s und --%s angegeben diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_es.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_es.properties new file mode 100644 index 000000000..f019d986d --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_es.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=No se pueden proporcionar los argumentos --%s y --%s conjuntamente diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_fr.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_fr.properties new file mode 100644 index 000000000..9e9c37c11 --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_fr.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=Vous ne pouvez pas utiliser \u00e0 la fois les arguments --%s et --%s diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ja.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ja.properties new file mode 100644 index 000000000..e7cb5c8dc --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ja.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=--%s \u5f15\u6570\u3068 --%s \u5f15\u6570\u306e\u4e21\u65b9\u306f\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093 diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ko.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ko.properties new file mode 100644 index 000000000..1bf6f3518 --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_ko.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=--%s \uc778\uc218\uc640 --%s \uc778\uc218\ub97c \ubaa8\ub450 \uc81c\uacf5\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_pl.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_pl.properties new file mode 100644 index 000000000..c0cc2e533 --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_pl.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=B\u0141\u0104D\: Nie mo\u017cesz poda\u0107 obydwu arument\u00f3w %s i %s w tym samym czasie diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_CN.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_CN.properties new file mode 100644 index 000000000..573ed952f --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_CN.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=\u4e0d\u80fd\u540c\u65f6\u63d0\u4f9b --%s \u548c --%s \u53c2\u6570 diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_TW.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_TW.properties new file mode 100644 index 000000000..47851740a --- /dev/null +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli_zh_TW.properties @@ -0,0 +1,17 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +ERR_TOOL_CONFLICTING_ARGS=\u60a8\u7121\u6cd5\u540c\u6642\u63d0\u4f9b --%s \u8207 --%s \u5f15\u6578 From 632d573212b5eeb77b8a3fd3e78dcc49481da3d8 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 25 Feb 2016 13:53:05 +0100 Subject: [PATCH 066/125] Code cleanup Add useful methods to handle arguments conflicts. --- .../opendj/cli/ConnectionFactoryProvider.java | 54 ++----------- .../java/com/forgerock/opendj/cli/Utils.java | 79 +++++++++++++++++++ 2 files changed, 86 insertions(+), 47 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java index 39cf4343d..7a3c7c4ac 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ConnectionFactoryProvider.java @@ -20,6 +20,7 @@ import static com.forgerock.opendj.cli.CliConstants.DEFAULT_LDAP_PORT; import static com.forgerock.opendj.cli.CliMessages.*; import static com.forgerock.opendj.cli.Utils.getHostNameForLdapUrl; +import static com.forgerock.opendj.cli.Utils.throwIfArgumentsConflict; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.AUTHN_BIND_REQUEST; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.CONNECT_TIMEOUT; import static org.forgerock.opendj.ldap.LDAPConnectionFactory.SSL_CONTEXT; @@ -447,45 +448,12 @@ private ConnectionFactory getConnectionFactory(boolean usePreAuthentication) thr * an argument exception is thrown. */ private void checkForConflictingArguments() throws ArgumentException { - // Couldn't have at the same time bindPassword and bindPasswordFile - if (bindPasswordArg.isPresent() && bindPasswordFileArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(bindPasswordArg.getLongIdentifier(), - bindPasswordFileArg.getLongIdentifier()); - throw new ArgumentException(message); - } - - /* - * Couldn't have at the same time trustAll and trustStore related arg - */ - if (trustAllArg.isPresent() && trustStorePathArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(trustAllArg.getLongIdentifier(), - trustStorePathArg.getLongIdentifier()); - throw new ArgumentException(message); - } - if (trustAllArg.isPresent() && trustStorePasswordArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(trustAllArg.getLongIdentifier(), - trustStorePasswordArg.getLongIdentifier()); - throw new ArgumentException(message); - } - if (trustAllArg.isPresent() && trustStorePasswordFileArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(trustAllArg.getLongIdentifier(), - trustStorePasswordFileArg.getLongIdentifier()); - throw new ArgumentException(message); - } - - /* - * Couldn't have at the same time trustStorePasswordArg and trustStorePasswordFileArg - */ - if (trustStorePasswordArg.isPresent() && trustStorePasswordFileArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(trustStorePasswordArg.getLongIdentifier(), - trustStorePasswordFileArg.getLongIdentifier()); - throw new ArgumentException(message); - } + throwIfArgumentsConflict(bindPasswordArg, bindPasswordFileArg); + throwIfArgumentsConflict(trustAllArg, trustStorePathArg); + throwIfArgumentsConflict(trustAllArg, trustStorePasswordArg); + throwIfArgumentsConflict(trustAllArg, trustStorePasswordFileArg); + throwIfArgumentsConflict(trustStorePasswordArg, trustStorePasswordFileArg); + throwIfArgumentsConflict(useStartTLSArg, useSSLArg); if (trustStorePathArg.isPresent()) { // Check that the path exists and is readable @@ -504,14 +472,6 @@ private void checkForConflictingArguments() throws ArgumentException { throw new ArgumentException(message); } } - - // Couldn't have at the same time startTLSArg and useSSLArg - if (useStartTLSArg.isPresent() && useSSLArg.isPresent()) { - final LocalizableMessage message = - ERR_TOOL_CONFLICTING_ARGS.get(useStartTLSArg.getLongIdentifier(), useSSLArg - .getLongIdentifier()); - throw new ArgumentException(message); - } } /** diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java index 5d6cf7d54..0bff591bd 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java @@ -31,6 +31,7 @@ import java.security.GeneralSecurityException; import java.text.SimpleDateFormat; import java.util.Arrays; +import java.util.Collection; import java.util.Date; import java.util.StringTokenizer; import java.util.TimeZone; @@ -658,4 +659,82 @@ public Integer validate(ConsoleApplication app, String rawInput) throws ClientEx } }; } + + /** + * Throws an {@link ArgumentException} if both provided {@link Argument} are presents in the command line arguments. + * + * @param arg1 + * The first {@link Argument} which should not be present if {@literal arg2} is. + * @param arg2 + * The second {@link Argument} which should not be present if {@literal arg1} is. + * @throws ArgumentException + * If both provided {@link Argument} are presents in the command line arguments + */ + public static void throwIfArgumentsConflict(final Argument arg1, final Argument arg2) throws ArgumentException { + if (argsConflicts(arg1, arg2)) { + throw new ArgumentException(conflictingArgsErrorMessage(arg1, arg2)); + } + } + + /** + * Adds a {@link LocalizableMessage} to the provided {@link Collection} + * if both provided {@link Argument} are presents in the command line arguments. + * + * @param errors + * The {@link Collection} to use to add the conflict error (if occurs). + * @param arg1 + * The first {@link Argument} which should not be present if {@literal arg2} is. + * @param arg2 + * The second {@link Argument} which should not be present if {@literal arg1} is. + */ + public static void addErrorMessageIfArgumentsConflict( + final Collection errors, final Argument arg1, final Argument arg2) { + if (argsConflicts(arg1, arg2)) { + errors.add(conflictingArgsErrorMessage(arg1, arg2)); + } + } + + /** + * Return {@code true} if provided {@link Argument} are presents in the command line arguments. + *

+ * If so, adds a {@link LocalizableMessage} to the provided {@link LocalizableMessageBuilder}. + * + * @param builder + * The {@link LocalizableMessageBuilder} to use to write the conflict error (if occurs). + * @param arg1 + * The first {@link Argument} which should not be present if {@literal arg2} is. + * @param arg2 + * The second {@link Argument} which should not be present if {@literal arg1} is. + * @return {@code true} if provided {@link Argument} are presents in the command line arguments. + */ + public static boolean appendErrorMessageIfArgumentsConflict( + final LocalizableMessageBuilder builder, final Argument arg1, final Argument arg2) { + if (argsConflicts(arg1, arg2)) { + if (builder.length() > 0) { + builder.append(LINE_SEPARATOR); + } + builder.append(conflictingArgsErrorMessage(arg1, arg2)); + return true; + } + return false; + } + + private static boolean argsConflicts(final Argument arg1, final Argument arg2) { + return arg1.isPresent() && arg2.isPresent(); + } + + /** + * Returns a {@link LocalizableMessage} which explains to the user + * that provided {@link Argument}s can not be used together on the command line. + * + * @param arg1 + * The first {@link Argument} which conflicts with {@literal arg2}. + * @param arg2 + * The second {@link Argument} which conflicts with {@literal arg1}. + * @return A {@link LocalizableMessage} which explains to the user that arguments + * can not be used together on the command line. + */ + public static LocalizableMessage conflictingArgsErrorMessage(final Argument arg1, final Argument arg2) { + return ERR_TOOL_CONFLICTING_ARGS.get(arg1.getLongIdentifier(), arg2.getLongIdentifier()); + } } From 292bf42179d5a131f7e94a1913d4e3a97d60eecc Mon Sep 17 00:00:00 2001 From: Fabio Pistolesi Date: Wed, 2 Mar 2016 11:13:50 +0100 Subject: [PATCH 067/125] OPENDJ-2731 Middle and final substring indexes fail to return resulting in an unindexed search. Aligning Indexer and SubString Assertion with regards to generated name for substring indexes, who must contain the substring length configured for the index, since it is used for the name of the tree in the Storage and for the index itself. --- .../AbstractSubstringMatchingRuleImpl.java | 9 +++-- ...AbstractSubstringMatchingRuleImplTest.java | 40 ++++++++++++------- .../CollationSubstringMatchingRuleTest.java | 8 ++-- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java index e47c0af97..83b0c42e8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -185,12 +185,13 @@ private T rangeMatch(IndexQueryFactory factory, String indexID, ByteSeque private void substringMatch(final IndexQueryFactory factory, final ByteString normSubstring, final Collection subqueries) { - int substrLength = factory.getIndexingOptions().substringKeySize(); + final int substrLength = factory.getIndexingOptions().substringKeySize(); + final String indexId = substringIndexId + ":" + substrLength; // There are two cases, depending on whether the user-provided // substring is smaller than the configured index substring length or not. if (normSubstring.length() < substrLength) { - subqueries.add(rangeMatch(factory, substringIndexId, normSubstring)); + subqueries.add(rangeMatch(factory, indexId, normSubstring)); } else { // Break the value up into fragments of length equal to the // index substring length, and read those keys. @@ -206,7 +207,7 @@ private void substringMatch(final IndexQueryFactory factory, final ByteSt } for (ByteSequence key : substringKeys) { - subqueries.add(factory.createExactMatchQuery(substringIndexId, key)); + subqueries.add(factory.createExactMatchQuery(indexId, key)); } } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java index ff6268826..9d3c9a675 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,6 +44,8 @@ @SuppressWarnings("javadoc") public class AbstractSubstringMatchingRuleImplTest extends AbstractSchemaTestCase { + private int subStringLength = 3; + private static class FakeSubstringMatchingRuleImpl extends AbstractSubstringMatchingRuleImpl { FakeSubstringMatchingRuleImpl() { @@ -135,8 +137,12 @@ private MatchingRuleImpl getRule() { } static IndexingOptions newIndexingOptions() { + return newIndexingOptions(3); + } + + static IndexingOptions newIndexingOptions(int subStringLength) { final IndexingOptions options = mock(IndexingOptions.class); - when(options.substringKeySize()).thenReturn(3); + when(options.substringKeySize()).thenReturn(subStringLength); return options; } @@ -188,6 +194,10 @@ private String gen() { return sb.toString(); } + private String subStringIndexID(String matchingRule) { + return matchingRule + ":" + subStringLength; + } + @Test(dataProvider = "validAssertions") public void testValidAssertions(String attrValue, String assertionValue, ConditionResult expected) throws Exception { @@ -204,10 +214,10 @@ public void testSubstringCreateIndexQueryForFinalWithMultipleSubqueries() throws null, null, Collections.EMPTY_LIST, valueOfUtf8("this")); assertEquals( - assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions())), + assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(subStringLength))), "intersect[" - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='his'), " - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='thi')" + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='his'), " + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='thi')" + "]"); } @@ -217,13 +227,13 @@ public void testSubstringCreateIndexQueryForAllNoSubqueries() throws Exception { null, valueOfUtf8("abc"), Arrays.asList(toByteStrings("def", "ghi")), valueOfUtf8("jkl")); assertEquals( - assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions())), + assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(subStringLength))), "intersect[" + "rangeMatch(" + EMR_CASE_EXACT_OID + ", 'abc' <= value < 'abd'), " - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='def'), " - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='ghi'), " - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='jkl'), " - + "exactMatch(" + SMR_CASE_EXACT_OID + ", value=='abc')" + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='def'), " + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='ghi'), " + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='jkl'), " + + "exactMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", value=='abc')" + "]"); } @@ -234,10 +244,10 @@ public void testSubstringCreateIndexQueryWithInitial() throws Exception { null, valueOfUtf8("aa"), Collections.EMPTY_LIST, null); assertEquals( - assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions())), + assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(subStringLength))), "intersect[" - + "rangeMatch(" + EMR_CASE_EXACT_OID + ", 'aa' <= value < 'ab'), " - + "rangeMatch(" + SMR_CASE_EXACT_OID + ", 'aa' <= value < 'ab')" + + "rangeMatch(" + EMR_CASE_EXACT_OID + ", 'aa' <= value < 'ab'), " + + "rangeMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", 'aa' <= value < 'ab')" + "]"); } @@ -249,12 +259,12 @@ public void testSubstringCreateIndexQueryWithInitialOverflowsInRange() throws Ex null, lower, Collections.EMPTY_LIST, null); assertEquals( - assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions())), + assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(subStringLength))), // 0x00 is the nul byte, a.k.a. string terminator // so everything after it is not part of the string "intersect[" + "rangeMatch(" + EMR_CASE_EXACT_OID + ", '" + lower + "' <= value < 'b\u0000'), " - + "rangeMatch(" + SMR_CASE_EXACT_OID + ", '" + lower + "' <= value < 'b\u0000')" + + "rangeMatch(" + subStringIndexID(SMR_CASE_EXACT_OID) + ", '" + lower + "' <= value < 'b\u0000')" + "]"); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java index a87e37c77..be997f90c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java @@ -145,15 +145,17 @@ public void testCreateIndexQuery() throws Exception { MatchingRule matchingRule = getRule(); Assertion assertion = matchingRule.getAssertion(value); - String indexQuery = assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(), false)); + int subStringLength = 3; + String indexQuery = assertion.createIndexQuery(new FakeIndexQueryFactory(newIndexingOptions(subStringLength), + false)); ByteString binit = matchingRule.normalizeAttributeValue(ByteString.valueOfUtf8("a")); ByteString bfinal = matchingRule.normalizeAttributeValue(ByteString.valueOfUtf8("c")); assertEquals(indexQuery, "intersect[" + "rangeMatch(fr.shared, '" + binit.toHexString() + "' <= value < '0054'), " - + "rangeMatch(fr.substring, '" + bfinal.toHexString() + "' <= value < '0056'), " - + "rangeMatch(fr.substring, '" + binit.toHexString() + "' <= value < '0054')]" + + "rangeMatch(fr.substring:" + subStringLength + ", '" + bfinal.toHexString() + "' <= value < '0056'), " + + "rangeMatch(fr.substring:" + subStringLength + ", '" + binit.toHexString() + "' <= value < '0054')]" ); } } From 34c99da24fb09338dfbaedc0f9803b8713f0f35f Mon Sep 17 00:00:00 2001 From: Mark Craig Date: Thu, 3 Mar 2016 15:56:44 +0100 Subject: [PATCH 068/125] OPENDJ-2704: Specify default backend types for different distributions This patch indicates the default for each "edition" delivered for version 3. --- .../src/main/resources/com/forgerock/opendj/cli/cli.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties index 5961af0ab..9b3c3527d 100644 --- a/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties +++ b/opendj-cli/src/main/resources/com/forgerock/opendj/cli/cli.properties @@ -456,7 +456,8 @@ REF_TITLE_SUBCOMMANDS=Subcommands REF_INTRO_SUBCOMMANDS=The %s command supports the following subcommands: REF_PART_TITLE_SUBCOMMANDS=%s Subcommands Reference REF_PART_INTRO_SUBCOMMANDS=This section covers %s subcommands. -REF_DEFAULT_BACKEND_TYPE=Depends on the distribution +REF_DEFAULT_BACKEND_TYPE=Default: je for standard edition, \ + pdb for OEM edition. # Supplements to descriptions for generated reference documentation. SUPPLEMENT_DESCRIPTION_CONTROLS= From 7a53457c3a877d61174c69a2825ab50e3e0e0516 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 3 Mar 2016 10:44:20 +0100 Subject: [PATCH 069/125] OPENDJ-2582 Factor out buildnumber plugin in poms As we were using the buildnumber-maven-plugin in few places of the sdk and server, factor out the 'generate-buildnumber' execution in opendj- sdk-parent pom: * Use the 1.4 version * Use buildRevision as property name for build number * Keep the useLastCommittedRevision property to false (default value) --- opendj-core/pom.xml | 12 ++---------- opendj-sdk-parent/pom.xml | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index 51d8e40af..fef52fa51 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -96,18 +96,10 @@ + org.codehaus.mojo buildnumber-maven-plugin - 1.4 - - - validate - - create - - - @@ -123,7 +115,7 @@ org.forgerock.opendj.ldif Apache Maven ${maven.version} - ${buildNumber} + ${buildRevision} ${scmBranch} ${maven.build.timestamp} ${java.version} diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index 171d75e3f..088aa2534 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -181,6 +181,25 @@ + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + generate-buildnumber + + create + + + buildRevision + -1 + + + + + org.apache.felix maven-bundle-plugin From 17d806ca1abb73ab32bc6e1119beb1b3dbfebab3 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Thu, 3 Mar 2016 15:53:07 +0100 Subject: [PATCH 070/125] OPENDJ-2582 Fix dsconfig --version Generalize the way that tool version and revision are computed and move it to opendj-cli module. Server's DSConfig class will then be able to use ToolVersionHandler.newToolVersionHandler("opendj-config") --- .../opendj/cli/ToolVersionHandler.java | 40 +++++++++++++++---- .../forgerock/opendj/ldap/tools/AddRate.java | 3 +- .../forgerock/opendj/ldap/tools/AuthRate.java | 3 +- .../opendj/ldap/tools/LDAPCompare.java | 3 +- .../opendj/ldap/tools/LDAPModify.java | 3 +- .../opendj/ldap/tools/LDAPPasswordModify.java | 3 +- .../opendj/ldap/tools/LDAPSearch.java | 3 +- .../forgerock/opendj/ldap/tools/LDIFDiff.java | 3 +- .../opendj/ldap/tools/LDIFModify.java | 3 +- .../opendj/ldap/tools/LDIFSearch.java | 3 +- .../forgerock/opendj/ldap/tools/MakeLDIF.java | 3 +- .../forgerock/opendj/ldap/tools/ModRate.java | 3 +- .../opendj/ldap/tools/SearchRate.java | 3 +- 13 files changed, 57 insertions(+), 19 deletions(-) rename opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SdkVersionHandler.java => opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolVersionHandler.java (59%) diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SdkVersionHandler.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolVersionHandler.java similarity index 59% rename from opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SdkVersionHandler.java rename to opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolVersionHandler.java index 0ef6d743c..cbb713e14 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SdkVersionHandler.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ToolVersionHandler.java @@ -11,9 +11,9 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ -package com.forgerock.opendj.ldap.tools; +package com.forgerock.opendj.cli; import java.io.IOException; import java.io.InputStream; @@ -22,10 +22,36 @@ import java.util.jar.Attributes; import java.util.jar.Manifest; -import com.forgerock.opendj.cli.VersionHandler; - /** Class that prints the version of the SDK to System.out. */ -public class SdkVersionHandler implements VersionHandler { +public final class ToolVersionHandler implements VersionHandler { + + /** + * Returns a {@link VersionHandler} which should be used by OpenDJ SDK tools. + *

+ * The printed version and SCM revision will be the one of the opendj-core module. + * @return A {@link VersionHandler} which should be used by OpenDJ SDK tools. + */ + public static VersionHandler newSdkVersionHandler() { + return newToolVersionHandler("opendj-core"); + } + + /** + * Returns a {@link VersionHandler} which should be used to print version and SCM revision of a module. + *

+ * The printed version and SCM revision will be read from the module MANIFEST.MF‌ file. + * @param moduleName + * Name of the module which uniquely identify the URL of the MANIFEST‌.MF file. + * @return A {@link VersionHandler} which should be used by OpenDJ SDK tools. + */ + public static VersionHandler newToolVersionHandler(final String moduleName) { + return new ToolVersionHandler(moduleName); + } + + private final String moduleName; + + private ToolVersionHandler(final String moduleName) { + this.moduleName = moduleName; + } @Override public void printVersion() { @@ -42,7 +68,7 @@ private String getVersion() { final Enumeration manifests = getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"); while (manifests.hasMoreElements()) { final URL manifestUrl = manifests.nextElement(); - if (manifestUrl.toString().contains("/opendj-core-")) { + if (manifestUrl.toString().contains(moduleName)) { try (InputStream manifestStream = manifestUrl.openStream()) { final Attributes attrs = new Manifest(manifestStream).getMainAttributes(); return attrs.getValue("Bundle-Version") + " (revision " + attrs.getValue("SCM-Revision") + ")"; @@ -51,7 +77,7 @@ private String getVersion() { } return null; } catch (IOException e) { - throw new RuntimeException("IOException while determining SDK version", e); + throw new RuntimeException("IOException while determining opendj tool version", e); } } } diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java index 95327e016..47dcec1d2 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AddRate.java @@ -16,6 +16,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.MultiColumnPrinter.column; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static java.util.concurrent.TimeUnit.*; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -398,7 +399,7 @@ int run(final String[] args) { final LocalizableMessage toolDescription = INFO_ADDRATE_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser(AddRate.class.getName(), toolDescription, false, true, 1, 1, "template-file-path"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_ADDRATE.get()); argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RATE_TOOLS.get()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java index caeaa1058..f0f6f8ffb 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/AuthRate.java @@ -18,6 +18,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.*; import static com.forgerock.opendj.cli.MultiColumnPrinter.column; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.ldap.tools.Utils.*; @@ -377,7 +378,7 @@ int run(final String[] args) { final ArgumentParser argParser = new ArgumentParser(AuthRate.class.getName(), toolDescription, false, true, 0, 0, "[filter format string] [attributes ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_AUTHRATE.get()); argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RATE_TOOLS.get()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java index 6eec15972..b5ac74c5b 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPCompare.java @@ -17,6 +17,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.Utils.readBytesFromFile; @@ -132,7 +133,7 @@ int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDAPCOMPARE_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser( LDAPCompare.class.getName(), toolDescription, false, true, 1, 0, "attribute:value [DN ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDAPCOMPARE.get()); ConnectionFactoryProvider connectionFactoryProvider; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java index 813dc3343..8ad5c11aa 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPModify.java @@ -17,6 +17,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; @@ -242,7 +243,7 @@ int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDAPMODIFY_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser(LDAPModify.class.getName(), toolDescription, false); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDAPMODIFY.get()); ConnectionFactoryProvider connectionFactoryProvider; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java index f422b24d4..18713648c 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPPasswordModify.java @@ -17,6 +17,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.CliMessages.INFO_FILE_PLACEHOLDER; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -89,7 +90,7 @@ private int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDAPPWMOD_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser(LDAPPasswordModify.class.getName(), toolDescription, false); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDAPPASSWORDMODIFY.get()); ConnectionFactoryProvider connectionFactoryProvider; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java index e7a6dfb08..07819229e 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDAPSearch.java @@ -74,6 +74,7 @@ import com.forgerock.opendj.util.StaticUtils; import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.Utils.printErrorMessage; import static com.forgerock.opendj.ldap.tools.Utils.printPasswordPolicyResults; import static org.forgerock.util.Utils.*; @@ -222,7 +223,7 @@ int run(final String[] args) { final ArgumentParser argParser = new ArgumentParser(LDAPSearch.class.getName(), toolDescription, false, true, 0, 0, "[filter] [attributes ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDAPSEARCH.get()); ConnectionFactoryProvider connectionFactoryProvider; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java index 3af335522..0a906707d 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFDiff.java @@ -18,6 +18,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_OUTPUT_LDIF_FILENAME; import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_OUTPUT_LDIF_FILENAME; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -71,7 +72,7 @@ private int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDIFDIFF_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser( LDIFDiff.class.getName(), toolDescription, false, true, 2, 2, "source target"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDIFDIFF.get()); final BooleanArgument showUsage; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java index f188d0b2d..5e6a3bc7f 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFModify.java @@ -17,6 +17,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_OUTPUT_LDIF_FILENAME; import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_OUTPUT_LDIF_FILENAME; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; @@ -76,7 +77,7 @@ private int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDIFMODIFY_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser( LDIFModify.class.getName(), toolDescription, false, true, 1, 2, "source [changes]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDIFMODIFY.get()); final BooleanArgument continueOnError; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java index 9dac709f3..a844af6f0 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/LDIFSearch.java @@ -16,6 +16,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -76,7 +77,7 @@ private int run(final String[] args) { final LocalizableMessage toolDescription = INFO_LDIFSEARCH_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser( LDIFSearch.class.getName(), toolDescription, false, true, 1, 0, "source [filter] [attributes ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_LDIFSEARCH.get()); final BooleanArgument showUsage; diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java index a99367577..93ae75eda 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java @@ -17,6 +17,7 @@ package com.forgerock.opendj.ldap.tools; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; import static org.forgerock.util.Utils.closeSilently; @@ -70,7 +71,7 @@ int run(final String[] args) { final LocalizableMessage toolDescription = INFO_MAKELDIF_TOOL_DESCRIPTION.get(); final ArgumentParser argParser = new ArgumentParser(MakeLDIF.class.getName(), toolDescription, false, true, 1, 1, "template-file-path"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_MAKELDIF.get()); argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_MAKELDIF.get()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java index c3848212e..102ea9f28 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/ModRate.java @@ -36,6 +36,7 @@ import com.forgerock.opendj.cli.StringArgument; import static com.forgerock.opendj.cli.ArgumentConstants.*; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -152,7 +153,7 @@ private int run(final String[] args) { final ArgumentParser argParser = new ArgumentParser(ModRate.class.getName(), toolDescription, false, true, 1, 0, "[(attribute:value format string) ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_MODRATE.get()); argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RATE_TOOLS.get()); diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java index a362fcfb6..b0f839b70 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/SearchRate.java @@ -18,6 +18,7 @@ import static com.forgerock.opendj.cli.ArgumentConstants.*; import static com.forgerock.opendj.cli.MultiColumnPrinter.column; +import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.cli.Utils.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.CommonArguments.*; @@ -198,7 +199,7 @@ private int run(final String[] args) { final ArgumentParser argParser = new ArgumentParser(SearchRate.class.getName(), toolDescription, false, true, 1, 0, "[filter format string] [attributes ...]"); - argParser.setVersionHandler(new SdkVersionHandler()); + argParser.setVersionHandler(newSdkVersionHandler()); argParser.setShortToolDescription(REF_SHORT_DESC_SEARCHRATE.get()); argParser.setDocToolDescriptionSupplement(SUPPLEMENT_DESCRIPTION_RATE_TOOLS.get()); From 692c7dd8f46194e965b0283a1d9a251077071cb0 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Fri, 4 Mar 2016 19:18:12 +0100 Subject: [PATCH 071/125] OPENDJ-2738 DN validation fails when RDN uses a custom attribute SchemaBuilder.java: * In addSchema0(), do not call addAttributeType(), but buildAttributeType() like for Syntax and MatchingRule SchemaBuilderTestCase.java: * Added a non regression test --- .../opendj/ldap/schema/SchemaBuilder.java | 44 +++++++------------ .../ldap/schema/SchemaBuilderTestCase.java | 21 +++++++++ 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java index afb792554..1a19fcaeb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java @@ -1189,13 +1189,7 @@ public DITStructureRule.Builder buildDITStructureRule(final DITStructureRule str * @return A builder to continue building the MatchingRule. */ public MatchingRule.Builder buildMatchingRule(final MatchingRule matchingRule) { - return buildMatchingRule(matchingRule, true); - } - - private MatchingRule.Builder buildMatchingRule(final MatchingRule matchingRule, final boolean initialize) { - if (initialize) { - lazyInitBuilder(); - } + lazyInitBuilder(); return new MatchingRule.Builder(matchingRule, this); } @@ -1255,13 +1249,7 @@ public ObjectClass.Builder buildObjectClass(final ObjectClass objectClass) { * @return A builder to continue building the Syntax. */ public Syntax.Builder buildSyntax(final Syntax syntax) { - return buildSyntax(syntax, true); - } - - private Syntax.Builder buildSyntax(final Syntax syntax, final boolean initialize) { - if (initialize) { - lazyInitBuilder(); - } + lazyInitBuilder(); return new Syntax.Builder(syntax, this); } @@ -2346,35 +2334,35 @@ private void addSchema0(final Schema schema, final boolean overwrite) { // unlikely, may be different in the new schema. for (final Syntax syntax : schema.getSyntaxes()) { - buildSyntax(syntax, false).addToSchema(overwrite); + buildSyntax(syntax).addToSchema(overwrite); } for (final MatchingRule matchingRule : schema.getMatchingRules()) { - buildMatchingRule(matchingRule, false).addToSchema(overwrite); + buildMatchingRule(matchingRule).addToSchema(overwrite); } for (final MatchingRuleUse matchingRuleUse : schema.getMatchingRuleUses()) { - addMatchingRuleUse(matchingRuleUse, overwrite); + buildMatchingRuleUse(matchingRuleUse).addToSchema(overwrite); } for (final AttributeType attributeType : schema.getAttributeTypes()) { - addAttributeType(attributeType, overwrite); + buildAttributeType(attributeType).addToSchema(overwrite); } for (final ObjectClass objectClass : schema.getObjectClasses()) { - addObjectClass(objectClass, overwrite); + buildObjectClass(objectClass).addToSchema(overwrite); } for (final NameForm nameForm : schema.getNameForms()) { - addNameForm(nameForm, overwrite); + buildNameForm(nameForm).addToSchema(overwrite); } for (final DITContentRule contentRule : schema.getDITContentRules()) { - addDITContentRule(contentRule, overwrite); + buildDITContentRule(contentRule).addToSchema(overwrite); } for (final DITStructureRule structureRule : schema.getDITStuctureRules()) { - addDITStructureRule(structureRule, overwrite); + buildDITStructureRule(structureRule).addToSchema(overwrite); } } @@ -2421,13 +2409,13 @@ private void lazyInitBuilder() { nameForm2StructureRules = new HashMap<>(); name2OIDs = new HashMap<>(); warnings = new LinkedList<>(); - } - if (copyOnWriteSchema != null) { - // Copy the schema. - addSchema0(copyOnWriteSchema, true); - options = Options.copyOf(copyOnWriteSchema.getOptions()); - copyOnWriteSchema = null; + if (copyOnWriteSchema != null) { + // Copy the schema. + addSchema0(copyOnWriteSchema, true); + options = Options.copyOf(copyOnWriteSchema.getOptions()); + copyOnWriteSchema = null; + } } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java index 29c2e0772..af5cf034a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java @@ -27,6 +27,7 @@ import java.util.ArrayList; +import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.opendj.ldap.ByteString; import org.forgerock.opendj.ldap.Connection; @@ -2137,4 +2138,24 @@ public void enumSyntaxAddThenRemove() { .as("Expected the enum ordering matching rule to be removed at the same time as the enum syntax") .hasSize(coreSchema.getMatchingRules().size()); } + + @Test + public void attributeTypesUseNewlyBuiltSyntaxes() throws Exception { + final Schema coreSchema = Schema.getCoreSchema(); + final Schema schema = new SchemaBuilder(coreSchema) + .addAttributeType("( 1.2.3.4.5.7 NAME 'associateoid' " + + "EQUALITY 2.5.13.2 ORDERING 2.5.13.3 SUBSTR 2.5.13.4 " + + "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE userApplications " + + "X-APPROX '1.3.6.1.4.1.26027.1.4.1' )", false) + .toSchema(); + + Syntax dnSyntax = schema.getAttributeType("distinguishedName").getSyntax(); + assertThat(dnSyntax).isSameAs(schema.getSyntax("1.3.6.1.4.1.1466.115.121.1.12")); + + LocalizableMessageBuilder invalidReason = new LocalizableMessageBuilder(); + boolean isValid = dnSyntax.valueIsAcceptable(ByteString.valueOfUtf8("associateoid=test"), invalidReason); + assertThat(isValid) + .as("Value should have been valid, but it is not: " + invalidReason.toString()) + .isTrue(); + } } From 46b51b4a895c4ce9f1036b0ec54ddfd16d17090b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 29 Feb 2016 16:30:17 +0100 Subject: [PATCH 072/125] OPENDJ-1342 Migrate AVA, RDN, and DN classes These changes are required to complete the migration of the server to the SDK's DN and RDN classes. DN.java: In toNormalizedByteString(), changed the representation to include a leading NORMALIZED_RDN_SEPARATOR when for all DNs other than the root DN. This is consistent with how the server stores data in dn2id or dn2uri. Moved RDN.AVA_CHAR_SEPARATOR here, to be consistent with NORMALIZED_* constants. Added RDN_CHAR_SEPARATOR and used it throughout this class. Added valueOf(ByteString), rdn(int) and toUUID(). Moved hasAttributeType() here from server's RDN. Inlined static method compareTo(DN, DN) RDN.java: Added MIN_VALUE and minValue(), and modified code to take care of it. Moved AVA_CHAR_SEPARATOR to DN class and used it throughout this class. DNTestCase.java: Added test cases for using RDN.maxValue() and DN.minValue() with a Map keyed by DNs DistinguishedNameEqualityMatchingRuleTest.java: Consequence of the change to DN.toNormalizedByteString() --- .../java/org/forgerock/opendj/ldap/DN.java | 105 ++++++++----- .../java/org/forgerock/opendj/ldap/RDN.java | 106 ++++++++++--- .../org/forgerock/opendj/ldap/DNTestCase.java | 139 +++++++++++++++--- ...inguishedNameEqualityMatchingRuleTest.java | 9 +- 4 files changed, 285 insertions(+), 74 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index 5956133b0..d93d03f3b 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -21,6 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.NoSuchElementException; +import java.util.UUID; import java.util.WeakHashMap; import org.forgerock.i18n.LocalizableMessage; @@ -56,6 +57,9 @@ public final class DN implements Iterable, Comparable { static final byte NORMALIZED_AVA_SEPARATOR = 0x01; static final byte NORMALIZED_ESC_BYTE = 0x02; + static final char RDN_CHAR_SEPARATOR = ','; + static final char AVA_CHAR_SEPARATOR = '+'; + private static final DN ROOT_DN = new DN(CoreSchema.getInstance(), null, null, ""); /** @@ -191,15 +195,13 @@ public static DN rootDN() { } /** - * Parses the provided LDAP string representation of a DN using the default - * schema. + * Parses the provided LDAP string representation of a DN using the default schema. * * @param dn * The LDAP string representation of a DN. * @return The parsed DN. * @throws LocalizedIllegalArgumentException - * If {@code dn} is not a valid LDAP string representation of a - * DN. + * If {@code dn} is not a valid LDAP string representation of a DN. * @throws NullPointerException * If {@code dn} was {@code null}. * @see #format(String, Object...) @@ -209,8 +211,7 @@ public static DN valueOf(final String dn) { } /** - * Parses the provided LDAP string representation of a DN using the provided - * schema. + * Parses the provided LDAP string representation of a DN using the provided schema. * * @param dn * The LDAP string representation of a DN. @@ -218,8 +219,7 @@ public static DN valueOf(final String dn) { * The schema to use when parsing the DN. * @return The parsed DN. * @throws LocalizedIllegalArgumentException - * If {@code dn} is not a valid LDAP string representation of a - * DN. + * If {@code dn} is not a valid LDAP string representation of a DN. * @throws NullPointerException * If {@code dn} or {@code schema} was {@code null}. * @see #format(String, Schema, Object...) @@ -243,21 +243,18 @@ public static DN valueOf(final String dn, final Schema schema) { } /** - * Compares the provided DN values to determine their relative order in a - * sorted list. The order is the natural order as defined by the - * {@code toNormalizedByteString()} method. + * Parses the provided LDAP string representation of a DN using the default schema. * - * @param dn1 - * The first DN to be compared. It must not be {@code null}. - * @param dn2 - * The second DN to be compared. It must not be {@code null}. - * @return A negative integer if the first DN should come before the second - * DN in a sorted list, a positive integer if the first DN should - * come after the second DN in a sorted list, or zero if the two DN - * values can be considered equal. + * @param dn + * The LDAP byte string representation of a DN. + * @return The parsed DN. + * @throws LocalizedIllegalArgumentException + * If {@code dn} is not a valid LDAP byte string representation of a DN. + * @throws NullPointerException + * If {@code dn} was {@code null}. */ - private static int compareTo(final DN dn1, final DN dn2) { - return dn1.toNormalizedByteString().compareTo(dn2.toNormalizedByteString()); + public static DN valueOf(ByteString dn) { + return DN.valueOf(dn.toString()); } /** Decodes a DN using the provided reader and schema. */ @@ -446,7 +443,7 @@ public DN child(final String attributeType, final Object attributeValue) { @Override public int compareTo(final DN dn) { - return compareTo(this, dn); + return toNormalizedByteString().compareTo(dn.toNormalizedByteString()); } @Override @@ -813,6 +810,29 @@ public RDN rdn() { return rdn; } + /** + * Returns the RDN at the specified index for this DN, + * or {@code null} if no such RDN exists. + *

+ * Here is an example usage: + * 

+     * DN.valueOf("ou=people,dc=example,dc=com").rdn(0) => "ou=people"
+     * DN.valueOf("ou=people,dc=example,dc=com").rdn(1) => "dc=example"
+     * DN.valueOf("ou=people,dc=example,dc=com").rdn(2) => "dc=com"
+     * DN.valueOf("ou=people,dc=example,dc=com").rdn(3) => null
+     *
+ * + * @param index + * The index of the requested RDN. + * @return The RDN at the specified index, or {@code null} if no such RDN exists. + * @throws IllegalArgumentException + * If {@code index} is less than zero. + */ + public RDN rdn(int index) { + DN parentDN = parent(index); + return parentDN != null ? parentDN.rdn : null; + } + /** * Returns a copy of this DN whose parent DN, {@code fromDN}, has been * renamed to the new parent DN, {@code toDN}. If this DN is not subordinate @@ -863,7 +883,7 @@ public String toString() { final StringBuilder builder = new StringBuilder(); rdn.toString(builder); if (!parent.isRootDN()) { - builder.append(','); + builder.append(RDN_CHAR_SEPARATOR); builder.append(parent); } stringValue = builder.toString(); @@ -883,20 +903,13 @@ public String toString() { */ public ByteString toNormalizedByteString() { if (normalizedDN == null) { - if (rdn() == null) { + if (rdn == null) { normalizedDN = ByteString.empty(); } else { - final ByteStringBuilder builder = new ByteStringBuilder(); - int i = size() - 1; - parent(i).rdn().toNormalizedByteString(builder); - for (i--; i >= 0; i--) { - final RDN rdn = parent(i).rdn(); - // Only add a separator if the RDN is not RDN.maxValue(). - if (rdn.size() != 0) { - builder.appendByte(DN.NORMALIZED_RDN_SEPARATOR); - } - rdn.toNormalizedByteString(builder); - } + final ByteString normalizedParent = parent.toNormalizedByteString(); + final ByteStringBuilder builder = new ByteStringBuilder(normalizedParent.length() + 16); + builder.appendBytes(normalizedParent); + rdn.toNormalizedByteString(builder); normalizedDN = builder.toByteString(); } } @@ -916,20 +929,38 @@ public String toNormalizedUrlSafeString() { return ""; } + // This code differs from toNormalizedByteString(), + // because we do not care about ordering comparisons. + // (so we do not append the RDN_SEPARATOR first) final StringBuilder builder = new StringBuilder(); int i = size() - 1; parent(i).rdn().toNormalizedUrlSafeString(builder); for (i--; i >= 0; i--) { final RDN rdn = parent(i).rdn(); - // Only add a separator if the RDN is not RDN.maxValue(). + // Only add a separator if the RDN is not RDN.maxValue() or RDN.minValue(). if (rdn.size() != 0) { - builder.append(','); + builder.append(RDN_CHAR_SEPARATOR); } rdn.toNormalizedUrlSafeString(builder); } return builder.toString(); } + /** + * Returns a UUID whose content is based on the normalized content of this DN. + * Two equivalent DNs subject to the same schema will always yield the same UUID. + * + * @return the UUID representing this DN + */ + public UUID toUUID() { + ByteString normDN = toNormalizedByteString(); + if (!normDN.isEmpty()) { + // remove leading RDN separator + normDN = normDN.subSequence(1, normDN.length()); + } + return UUID.nameUUIDFromBytes(normDN.toByteArray()); + } + /** * A compact representation of a DN, suitable for equality and comparisons, and providing a natural hierarchical * ordering. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java index aef080808..85854ac55 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java @@ -16,6 +16,11 @@ */ package org.forgerock.opendj.ldap; +import static org.forgerock.opendj.ldap.DN.AVA_CHAR_SEPARATOR; +import static org.forgerock.opendj.ldap.DN.RDN_CHAR_SEPARATOR; +import static org.forgerock.opendj.ldap.DN.NORMALIZED_AVA_SEPARATOR; +import static org.forgerock.opendj.ldap.DN.NORMALIZED_RDN_SEPARATOR; + import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_TYPE_NOT_FOUND; import java.util.ArrayList; @@ -30,10 +35,10 @@ import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.Schema; import org.forgerock.opendj.ldap.schema.UnknownSchemaElementException; +import org.forgerock.util.Reject; import com.forgerock.opendj.util.Iterators; import com.forgerock.opendj.util.SubstringReader; -import org.forgerock.util.Reject; /** * A relative distinguished name (RDN) as defined in RFC 4512 section 2.3 is the @@ -63,18 +68,44 @@ */ public final class RDN implements Iterable, Comparable { - /** Separator for AVAs. */ - private static final char AVA_CHAR_SEPARATOR = '+'; - /** - * A constant holding a special RDN having zero AVAs and which always - * compares greater than any other RDN other than itself. + * A constant holding a special RDN having zero AVAs + * and which sorts before any RDN other than itself. + */ + private static final RDN MIN_VALUE = new RDN(new AVA[0], ""); + /** + * A constant holding a special RDN having zero AVAs + * and which sorts after any RDN other than itself. */ private static final RDN MAX_VALUE = new RDN(new AVA[0], ""); /** - * Returns a constant containing a special RDN which is greater than any - * other RDN other than itself. This RDN may be used in order to perform + * Returns a constant containing a special RDN which sorts before any + * RDN other than itself. This RDN may be used in order to perform + * range queries on DN keyed collections such as {@code SortedSet}s and + * {@code SortedMap}s. For example, the following code can be used to + * construct a range whose contents is a sub-tree of entries, excluding the base entry: + * + * 
+     * SortedMap entries = ...;
+     * DN baseDN = ...;
+     *
+     * // Returns a map containing the baseDN and all of its subordinates.
+     * SortedMap subtree = entries.subMap(
+     *     baseDN.child(RDN.minValue()), baseDN.child(RDN.maxValue()));
+     *
+ * + * @return A constant containing a special RDN which sorts before any + * RDN other than itself. + * @see #maxValue() + */ + public static RDN minValue() { + return MIN_VALUE; + } + + /** + * Returns a constant containing a special RDN which sorts after any + * RDN other than itself. This RDN may be used in order to perform * range queries on DN keyed collections such as {@code SortedSet}s and * {@code SortedMap}s. For example, the following code can be used to * construct a range whose contents is a sub-tree of entries: @@ -84,11 +115,12 @@ public final class RDN implements Iterable, Comparable { * DN baseDN = ...; * * // Returns a map containing the baseDN and all of its subordinates. - * SortedMap subtree = entries.subMap(baseDN, baseDN.child(RDN.maxValue)); + * SortedMap subtree = entries.subMap(baseDN, baseDN.child(RDN.maxValue())); * * - * @return A constant containing a special RDN which is greater than any - * other RDN other than itself. + * @return A constant containing a special RDN which sorts after any + * RDN other than itself. + * @see #minValue() */ public static RDN maxValue() { return MAX_VALUE; @@ -244,6 +276,9 @@ private RDN(final AVA[] avas, final String stringValue) { @Override public int compareTo(final RDN rdn) { + // FIXME how about replacing this method body with the following code? + // return toNormalizedByteString().compareTo(rdn.toNormalizedByteString()) + // Identity. if (this == rdn) { return 0; @@ -253,11 +288,18 @@ public int compareTo(final RDN rdn) { if (this == MAX_VALUE) { return 1; } - if (rdn == MAX_VALUE) { return -1; } + // MIN_VALUE is always less than any other RDN other than itself. + if (this == MIN_VALUE) { + return -1; + } + if (rdn == MIN_VALUE) { + return 1; + } + // Compare number of AVAs first as this is quick and easy. final int sz1 = avas.length; final int sz2 = rdn.avas.length; @@ -347,6 +389,22 @@ public boolean isMultiValued() { return avas.length > 1; } + /** + * Indicates whether this RDN includes the specified attribute type. + * + * @param attributeType The attribute type for which to make the determination. + * @return {@code true} if the RDN includes the specified attribute type, + * or {@code false} if not. + */ + public boolean hasAttributeType(AttributeType attributeType) { + for (AVA ava : avas) { + if (ava.getAttributeType().equals(attributeType)) { + return true; + } + } + return false; + } + /** * Returns an iterator of the AVAs contained in this RDN. The AVAs will be * returned in the user provided order. @@ -386,7 +444,7 @@ public String toString() { final StringBuilder builder = new StringBuilder(); avas[0].toString(builder); for (int i = 1; i < avas.length; i++) { - builder.append('+'); + builder.append(AVA_CHAR_SEPARATOR); avas[i].toString(builder); } stringValue = builder.toString(); @@ -411,17 +469,22 @@ StringBuilder toString(final StringBuilder builder) { ByteStringBuilder toNormalizedByteString(final ByteStringBuilder builder) { switch (size()) { case 0: - // Handle RDN.maxValue(). - builder.appendByte(DN.NORMALIZED_AVA_SEPARATOR); + if (this == MIN_VALUE) { + builder.appendByte(NORMALIZED_RDN_SEPARATOR); + } else { // can only be MAX_VALUE + builder.appendByte(NORMALIZED_AVA_SEPARATOR); + } break; case 1: + builder.appendByte(NORMALIZED_RDN_SEPARATOR); getFirstAVA().toNormalizedByteString(builder); break; default: + builder.appendByte(NORMALIZED_RDN_SEPARATOR); Iterator it = getSortedAvas(); it.next().toNormalizedByteString(builder); while (it.hasNext()) { - builder.appendByte(DN.NORMALIZED_AVA_SEPARATOR); + builder.appendByte(NORMALIZED_AVA_SEPARATOR); it.next().toNormalizedByteString(builder); } break; @@ -441,8 +504,13 @@ ByteStringBuilder toNormalizedByteString(final ByteStringBuilder builder) { StringBuilder toNormalizedUrlSafeString(final StringBuilder builder) { switch (size()) { case 0: - // Handle RDN.maxValue(). - builder.append(RDN.AVA_CHAR_SEPARATOR); + // since MIN_VALUE and MAX_VALUE are only used for sorting DNs, + // it is strange to call toNormalizedUrlSafeString() on one of them + if (this == MIN_VALUE) { + builder.append(RDN_CHAR_SEPARATOR); + } else { // can only be MAX_VALUE + builder.append(AVA_CHAR_SEPARATOR); + } break; case 1: getFirstAVA().toNormalizedUrlSafe(builder); @@ -451,7 +519,7 @@ StringBuilder toNormalizedUrlSafeString(final StringBuilder builder) { Iterator it = getSortedAvas(); it.next().toNormalizedUrlSafe(builder); while (it.hasNext()) { - builder.append(RDN.AVA_CHAR_SEPARATOR); + builder.append(AVA_CHAR_SEPARATOR); it.next().toNormalizedUrlSafe(builder); } break; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java index 33c3f71b4..c49724567 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java @@ -12,17 +12,22 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; import static java.lang.Integer.*; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.fail; +import static org.assertj.core.api.Assertions.*; import static org.testng.Assert.*; +import java.util.Collection; import java.util.Iterator; +import java.util.Map; import java.util.NoSuchElementException; +import java.util.TreeMap; +import java.util.UUID; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.testng.annotations.DataProvider; @@ -594,18 +599,22 @@ public void testIsChildOfException() throws Exception { dn.isChildOf((String) null); } - /** - * Tests the parent method that require iteration. - */ + /** Tests the parent and rdn method that require iteration. */ @Test - public void testIterableParent() { + public void testIterableParentAndRdn() { final String str = "ou=people,dc=example,dc=com"; final DN dn = DN.valueOf(str); // Parent at index 0 is self. - assertEquals(dn, dn.parent(0)); + assertEquals(dn.parent(0), dn); assertEquals(dn.parent(1), DN.valueOf("dc=example,dc=com")); assertEquals(dn.parent(2), DN.valueOf("dc=com")); assertEquals(dn.parent(3), DN.rootDN()); + assertEquals(dn.parent(4), null); + + assertEquals(dn.rdn(0), RDN.valueOf("ou=people")); + assertEquals(dn.rdn(1), RDN.valueOf("dc=example")); + assertEquals(dn.rdn(2), RDN.valueOf("dc=com")); + assertEquals(dn.rdn(3), null); } /** @@ -674,8 +683,6 @@ public void testParentInteraction() throws Exception { assertEquals(p.rdn(), RDN.valueOf("dc=bar")); - assertEquals(p.rdn(), RDN.valueOf("dc=bar")); - assertEquals(p.parent(), DN.valueOf("dc=opendj,dc=org")); assertEquals(p.parent(), e.parent()); @@ -719,15 +726,25 @@ public void testRootDN1() throws Exception { } /** - * Tests the root DN. + * Tests {@link DN#valueOf(String)}. * * @throws Exception * If the test failed unexpectedly. */ @Test(expectedExceptions = { NullPointerException.class, AssertionError.class }) - public void testRootDN2() throws Exception { - final DN dn = DN.valueOf(null); - assertEquals(dn, DN.rootDN()); + public void testValueOfString() throws Exception { + DN.valueOf((String) null); + } + + /** + * Tests {@link DN#valueOf(ByteString)}. + * + * @throws Exception + * If the test failed unexpectedly. + */ + @Test(expectedExceptions = { NullPointerException.class, AssertionError.class }) + public void testValueOfByteString() throws Exception { + DN.valueOf((ByteString) null); } /** @@ -1030,7 +1047,7 @@ public void testIterator() { } @DataProvider - public Object[][] toIrreversibleNormalizedByteStringDataProvider() { + public Object[][] toNormalizedByteStringDataProvider() { // @formatter:off return new Object[][] { // first value to normalize, second value to normalize, expected sign of comparison between the two @@ -1038,6 +1055,13 @@ public Object[][] toIrreversibleNormalizedByteStringDataProvider() { { "dc=example,dc=com", "dc=example,dc=com", 0 }, { "cn=test+dc=example,dc=com", "cn=test+dc=example,dc=com", 0 }, { "dc=example+cn=test,dc=com", "cn=test+dc=example,dc=com", 0 }, + // siblings + { "cn=test,dc=com", "cn=test+dc=example,dc=com", -1 }, + { "cn=test+dc=example,dc=com", "cn=test,dc=com", 1 }, + { "dc=example,dc=com", "cn=test+dc=example,dc=com", 1 }, + { "cn=test+dc=example,dc=com", "dc=example,dc=com", -1 }, + { "dc=example,dc=com", "dc=example+cn=test,dc=com", 1 }, + { "dc=example+cn=test,dc=com", "dc=example,dc=com", -1 }, // parent entry is followed by its children, not its siblings { "dc=com", "dc=example,dc=com", -1 }, { "dc=com", "dc=test,dc=example,dc=com", -1}, @@ -1071,7 +1095,7 @@ public Object[][] toIrreversibleNormalizedByteStringDataProvider() { // @formatter:on } - @Test(dataProvider = "toIrreversibleNormalizedByteStringDataProvider") + @Test(dataProvider = "toNormalizedByteStringDataProvider") public void testToNormalizedByteString(String first, String second, int expectedCompareResult) { DN actual = DN.valueOf(first); DN expected = DN.valueOf(second); @@ -1092,7 +1116,81 @@ public void testToNormalizedByteString2(String one, String two, String three) { } @DataProvider - public Object[][] toIrreversibleReadableStringDataProvider() { + private Object[][] minAndMaxRdnsDataProvider() { + DN dcCom = DN.valueOf("dc=com"); + DN dcExampleDcCom = DN.valueOf("dc=example,dc=com"); + DN cnTestDcCom = DN.valueOf("cn=test,dc=com"); + return new Object[][] { + { dcCom, dcCom.child(RDN.minValue()), -1 }, + { dcCom, dcCom.child(RDN.maxValue()), -1 }, + { dcExampleDcCom, dcExampleDcCom.child(RDN.minValue()), -1 }, + { dcExampleDcCom, dcExampleDcCom.child(RDN.maxValue()), -1 }, + { dcExampleDcCom, dcCom.child(RDN.minValue()), 1 }, + { dcExampleDcCom, dcCom.child(RDN.maxValue()), -1 }, + // siblings + { DN.valueOf("cn=test+dc=example,dc=com"), cnTestDcCom.child(RDN.minValue()), 1 }, + { DN.valueOf("dc=example+cn=test,dc=com"), cnTestDcCom.child(RDN.minValue()), 1 }, + { DN.valueOf("cn=test+dc=example,dc=com"), cnTestDcCom.child(RDN.maxValue()), 1 }, + { DN.valueOf("dc=example+cn=test,dc=com"), cnTestDcCom.child(RDN.maxValue()), 1 }, + }; + } + + /** Using DN as a Map key depends on this behaviour. In particular MemoryBackend depends on this behaviour. */ + @Test(dataProvider = "minAndMaxRdnsDataProvider") + public void testToNormalizedByteStringWithMinAndMaxRdns(DN dn1, DN dn2, int expectedCompareResult) { + int cmp = dn1.toNormalizedByteString().compareTo(dn2.toNormalizedByteString()); + assertThat(signum(cmp)).isEqualTo(expectedCompareResult); + } + + @Test + public void testToNormalizedByteStringWithMinAndMaxRdnsInOrderedCollection() { + DN dcCom = DN.valueOf("dc=com"); + DN cnTestDcCom = DN.valueOf("cn=test,dc=com"); + DN cnDeeperCnTestDcCom = DN.valueOf("cn=deeper,cn=test,dc=com"); + DN cnTestAndDcExampleDcCom = DN.valueOf("cn=test+dc=example,dc=com"); + DN dcExampleDcCom = DN.valueOf("dc=example,dc=com"); + + TreeMap map = new TreeMap<>(); + putAll(map, dcCom, cnTestDcCom, cnDeeperCnTestDcCom, cnTestAndDcExampleDcCom, dcExampleDcCom); + + assertThat(subordinates(map, dcCom)) + .containsExactly(cnTestDcCom, cnDeeperCnTestDcCom, cnTestAndDcExampleDcCom, dcExampleDcCom); + assertThat(subordinates(map, cnTestDcCom)) + .containsExactly(cnDeeperCnTestDcCom); + + assertThat(after(map, cnTestDcCom)) + .containsExactly(cnDeeperCnTestDcCom, cnTestAndDcExampleDcCom, dcExampleDcCom); + assertThat(after(map, cnDeeperCnTestDcCom)) + .containsExactly(cnTestAndDcExampleDcCom, dcExampleDcCom); + + assertThat(before(map, cnTestDcCom)) + .containsExactly(dcCom); + assertThat(before(map, cnDeeperCnTestDcCom)) + .containsExactly(dcCom, cnTestDcCom); + } + + private void putAll(Map map, DN... dns) { + for (DN dn : dns) { + map.put(dn.toNormalizedByteString(), dn); + } + } + + private Collection subordinates(TreeMap map, DN dn) { + return map.subMap( + dn.child(RDN.minValue()).toNormalizedByteString(), + dn.child(RDN.maxValue()).toNormalizedByteString()).values(); + } + + private Collection before(TreeMap map, DN dn) { + return map.headMap(dn.toNormalizedByteString(), false).values(); + } + + private Collection after(TreeMap map, DN dn) { + return map.tailMap(dn.toNormalizedByteString(), false).values(); + } + + @DataProvider + public Object[][] toNormalizedUrlSafeStringDataProvider() { // @formatter:off return new Object[][] { // first value = string used to build DN, second value = expected readable string @@ -1125,7 +1223,7 @@ public Object[][] toIrreversibleReadableStringDataProvider() { // @formatter:on } - @Test(dataProvider = "toIrreversibleReadableStringDataProvider") + @Test(dataProvider = "toNormalizedUrlSafeStringDataProvider") public void testToNormalizedUrlSafeString(String dnAsString, String expectedReadableString) { DN actual = DN.valueOf(dnAsString); assertEquals(actual.toNormalizedUrlSafeString(), expectedReadableString); @@ -1141,4 +1239,11 @@ public void testToNormalizedUrlSafeString2(String one, String two, String three) assertEquals(irreversibleReadableString, dn2.toNormalizedUrlSafeString()); assertEquals(irreversibleReadableString, dn3.toNormalizedUrlSafeString()); } + + @Test + public void toUUID() { + UUID uuid1 = DN.valueOf("dc=example+cn=test,dc=com").toUUID(); + UUID uuid2 = DN.valueOf("cn=test+dc=example,dc=com").toUUID(); + assertEquals(uuid1, uuid2); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java index c89336317..5a5a79ead 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java @@ -21,6 +21,7 @@ import static org.testng.Assert.assertEquals; import org.forgerock.opendj.ldap.ByteString; +import org.forgerock.opendj.ldap.ByteStringBuilder; import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -194,8 +195,14 @@ public void testNormalization(final String value1, final String value2) throws E final MatchingRule rule = getRule(); final ByteString normalizedValue1 = rule.normalizeAttributeValue(ByteString.valueOfUtf8(value1)); - final ByteString expectedValue = ByteString.valueOfUtf8(value2); + final ByteString expectedValue = toExpectedNormalizedByteString(value2); assertEquals(normalizedValue1, expectedValue); } + private ByteString toExpectedNormalizedByteString(final String s) { + if (s.isEmpty()) { + return ByteString.valueOfUtf8(s); + } + return new ByteStringBuilder().appendByte(0).appendUtf8(s).toByteString(); + } } From fbb29bd65f9f21912d578169b6de61130a5d6d02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 29 Feb 2016 16:38:10 +0100 Subject: [PATCH 073/125] Use switch statement with SearchScope instead of if statement --- .../main/java/org/forgerock/opendj/ldap/DN.java | 11 ++++++----- .../org/forgerock/opendj/ldap/MemoryBackend.java | 16 +++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index d93d03f3b..ee69ebad5 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -511,20 +511,21 @@ public boolean isChildOf(final String dn) { * If {@code dn} or {@code scope} was {@code null}. */ public boolean isInScopeOf(DN dn, SearchScope scope) { - if (scope == SearchScope.BASE_OBJECT) { + switch (scope.asEnum()) { + case BASE_OBJECT: // The base DN must equal this DN. return equals(dn); - } else if (scope == SearchScope.SINGLE_LEVEL) { + case SINGLE_LEVEL: // The parent DN must equal the base DN. return isChildOf(dn); - } else if (scope == SearchScope.SUBORDINATES) { + case SUBORDINATES: // This DN must be a descendant of the provided base DN, but // not equal to it. return isSubordinateOrEqualTo(dn) && !equals(dn); - } else if (scope == SearchScope.WHOLE_SUBTREE) { + case WHOLE_SUBTREE: // This DN must be a descendant of the provided base DN. return isSubordinateOrEqualTo(dn); - } else { + default: // This is a scope that we don't recognize. return false; } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java index 3b42be5b4..714817d45 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -379,18 +379,24 @@ public void handleSearch(final RequestContext requestContext, final SearchReques final Matcher matcher = filter.matcher(schema); final AttributeFilter attributeFilter = new AttributeFilter(request.getAttributes(), schema).typesOnly(request.isTypesOnly()); - if (scope.equals(SearchScope.BASE_OBJECT)) { + switch (scope.asEnum()) { + case BASE_OBJECT: final Entry baseEntry = getRequiredEntry(request, dn); if (matcher.matches(baseEntry).toBoolean()) { sendEntry(attributeFilter, entryHandler, baseEntry); } resultHandler.handleResult(newResult(ResultCode.SUCCESS)); - } else if (scope.equals(SearchScope.SINGLE_LEVEL) || scope.equals(SearchScope.SUBORDINATES) - || scope.equals(SearchScope.WHOLE_SUBTREE)) { + break; + + case SINGLE_LEVEL: + case SUBORDINATES: + case WHOLE_SUBTREE: searchWithSubordinates(requestContext, entryHandler, resultHandler, dn, matcher, attributeFilter, request.getSizeLimit(), scope, request.getControl(SimplePagedResultsControl.DECODER, new DecodeOptions())); - } else { + break; + + default: throw newLdapException(ResultCode.PROTOCOL_ERROR, "Search request contains an unsupported search scope"); } From 6a9ebd41f3fb013560aa40a4ebb7bdf03064e390 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 7 Mar 2016 13:57:06 +0100 Subject: [PATCH 074/125] core.properties: fixed "is is" typo --- .../resources/com/forgerock/opendj/ldap/core.properties | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 44a2bc0df..13156393d 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -1286,10 +1286,9 @@ WARN_ATTR_SYNTAX_ATTRTYPE_UNKNOWN_SUBSTRING_MR1=The definition for \ the attribute type "%s" declared that substring matching should be \ performed using the matching rule "%s" which is not defined \ in the schema -WARN_ATTR_TYPE_NOT_DEFINED1=The definition for the \ - attribute type "%s" declared that it should use the syntax \ - "%s" which is is not defined in the schema. The default syntax "%s" \ - will be used instead +WARN_ATTR_TYPE_NOT_DEFINED1=The definition for the attribute type "%s" \ + declared that it should use the syntax "%s" which is not defined in the schema. \ + The default syntax "%s" will be used instead ERR_ATTR_SYNTAX_DCR_UNKNOWN_REQUIRED_ATTR1=The DIT content rule "%s" \ is associated with a required attribute type "%s" which is not defined in the \ schema From 744f621acb452ee6e1d5eb7d39d92c8162ce1ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 7 Mar 2016 17:20:16 +0100 Subject: [PATCH 075/125] DN.java: fixed checkstyle --- opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index ee69ebad5..87fcf9322 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -961,7 +961,7 @@ public UUID toUUID() { } return UUID.nameUUIDFromBytes(normDN.toByteArray()); } - + /** * A compact representation of a DN, suitable for equality and comparisons, and providing a natural hierarchical * ordering. From 9c2340d3aed50f10e425a0e19085428b92a7f51b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 9 Mar 2016 11:27:23 +0100 Subject: [PATCH 076/125] Remove all {@inheritDoc} javadoc tags (superseded by @Override annotations) --- .../forgerock/opendj/cli/ArgumentGroup.java | 6 +- .../opendj/cli/TabSeparatedTablePrinter.java | 16 +- .../opendj/cli/TextTablePrinter.java | 29 +--- .../cli/ConsoleApplicationTestCase.java | 14 +- .../GetConnectionIDExtendedResult.java | 7 +- .../GetSymmetricKeyExtendedRequest.java | 33 +--- .../PasswordPolicyStateExtendedRequest.java | 145 ++++-------------- .../forgerock/opendj/util/Collections2.java | 28 +--- .../opendj/util/SizeLimitInputStream.java | 13 +- .../opendj/io/ASN1OutputStreamWriter.java | 20 +-- .../ldap/AbstractAsynchronousConnection.java | 16 +- .../opendj/ldap/AbstractConnection.java | 9 +- .../ldap/AbstractConnectionWrapper.java | 7 +- .../opendj/ldap/AbstractFilterVisitor.java | 6 +- .../opendj/ldap/AbstractMapEntry.java | 15 +- .../ldap/AbstractSynchronousConnection.java | 9 +- .../org/forgerock/opendj/ldap/ByteString.java | 25 +-- .../opendj/ldap/DereferenceAliasesPolicy.java | 9 +- .../org/forgerock/opendj/ldap/Entries.java | 30 +--- .../opendj/ldap/GeneralizedTime.java | 7 +- .../org/forgerock/opendj/ldap/LDAPUrl.java | 93 +++-------- .../opendj/ldap/LinkedAttribute.java | 23 +-- .../forgerock/opendj/ldap/Modification.java | 8 +- .../opendj/ldap/ModificationType.java | 4 +- .../ldap/RequestHandlerFactoryAdapter.java | 79 ++-------- .../org/forgerock/opendj/ldap/ResultCode.java | 6 +- .../forgerock/opendj/ldap/SearchScope.java | 19 +-- .../ADNotificationRequestControl.java | 7 +- ...ntryChangeNotificationResponseControl.java | 16 +- .../controls/PasswordPolicyErrorType.java | 39 ++--- .../controls/PasswordPolicyWarningType.java | 6 +- .../controls/PersistentSearchChangeType.java | 25 +-- .../AbstractApproximateMatchingRuleImpl.java | 4 +- .../AbstractEqualityMatchingRuleImpl.java | 4 +- .../AbstractOrderingMatchingRuleImpl.java | 7 +- .../ldap/schema/CertificateSyntaxImpl.java | 10 +- .../schema/CollationMatchingRulesImpl.java | 51 ++---- .../KeywordEqualityMatchingRuleImpl.java | 1 - .../opendj/ldap/schema/SchemaElement.java | 9 +- .../ldap/spi/SearchResultLdapPromiseImpl.java | 10 +- .../opendj/ldif/ConnectionEntryReader.java | 17 +- .../opendj/ldif/LDIFChangeRecordReader.java | 19 +-- .../opendj/ldif/LDIFChangeRecordWriter.java | 13 +- .../opendj/ldif/LDIFEntryReader.java | 9 +- ...bstractAsynchronousConnectionTestCase.java | 21 +-- .../ldap/MockConnectionEventListener.java | 10 +- ...AbstractSubstringMatchingRuleImplTest.java | 12 +- .../ldap/schema/AttributeTypeSyntaxTest.java | 9 +- .../BitStringEqualityMatchingRuleTest.java | 8 +- .../ldap/schema/BitStringSyntaxTest.java | 4 +- .../BooleanEqualityMatchingRuleTest.java | 10 +- .../CaseExactEqualityMatchingRuleTest.java | 10 +- .../CaseExactIA5EqualityMatchingRuleTest.java | 10 +- .../CaseExactOrderingMatchingRuleTest.java | 9 +- .../CaseIgnoreEqualityMatchingRuleTest.java | 10 +- ...CaseIgnoreIA5EqualityMatchingRuleTest.java | 10 +- .../CaseIgnoreOrderingMatchingRuleTest.java | 9 +- .../CollationEqualityMatchingRuleTest.java | 7 +- .../CollationGreaterThanMatchingRuleTest.java | 6 +- ...ionGreaterThanOrEqualMatchingRuleTest.java | 7 +- .../CollationLessThanMatchingRuleTest.java | 6 +- ...lationLessThanOrEqualMatchingRuleTest.java | 6 +- .../CollationSubstringMatchingRuleTest.java | 5 - .../ldap/schema/CountryStringSyntaxTest.java | 7 +- .../ldap/schema/DITContentRuleSyntaxTest.java | 7 +- ...irstComponentEqualityMatchingRuleTest.java | 11 +- .../ldap/schema/EnumSyntaxTestCase.java | 8 +- ...neralizedTimeEqualityMatchingRuleTest.java | 11 +- ...neralizedTimeOrderingMatchingRuleTest.java | 10 +- .../schema/GeneralizedTimeSyntaxTest.java | 8 +- .../opendj/ldap/schema/GuideSyntaxTest.java | 8 +- .../ldap/schema/IA5StringSyntaxTest.java | 9 +- .../IntegerEqualityMatchingRuleTest.java | 11 +- .../IntegerOrderingMatchingRuleTest.java | 10 +- .../opendj/ldap/schema/IntegerSyntaxTest.java | 9 +- .../opendj/ldap/schema/LDAPSyntaxTest.java | 8 +- .../ldap/schema/MatchingRuleSyntaxTest.java | 9 +- .../schema/MatchingRuleUseSyntaxTest.java | 8 +- ...NumericStringEqualityMatchingRuleTest.java | 11 +- ...NumericStringOrderingMatchingRuleTest.java | 9 +- .../ldap/schema/OtherMailboxSyntaxTest.java | 8 +- ...artialDateAndTimeMatchingRuleTestCase.java | 4 - ...tationAddressEqualityMatchingRuleTest.java | 11 +- ...olInformationEqualityMatchingRuleTest.java | 11 +- .../ldap/schema/RegexSyntaxTestCase.java | 9 +- ...lativeTimeGreaterThanMatchingRuleTest.java | 4 - .../RelativeTimeLessThanMatchingRuleTest.java | 4 - .../schema/SubstitutionSyntaxTestCase.java | 8 +- .../schema/TelephoneNumberSyntaxTest.java | 10 +- .../opendj/ldap/schema/TelexSyntaxTest.java | 10 +- .../opendj/ldap/schema/UTCTimeSyntaxTest.java | 7 +- .../schema/UUIDEqualityMatchingRuleTest.java | 11 +- .../schema/UUIDOrderingMatchingRuleTest.java | 9 +- .../opendj/ldap/schema/UUIDSyntaxTest.java | 8 +- .../UniqueMemberEqualityMatchingRuleTest.java | 11 +- ...PasswordExactEqualityMatchingRuleTest.java | 11 +- .../schema/WordEqualityMatchingRuleTest.java | 11 +- .../ldap/spi/BasicTransportProvider.java | 4 +- .../maven/doc/GenerateMessageFileMojo.java | 41 ++--- .../opendj/grizzly/LDAPServerFilter.java | 18 +-- .../grizzly/GrizzlyLDAPListenerTestCase.java | 45 +----- .../opendj/examples/ProxyBackend.java | 9 -- .../opendj/examples/SearchAsync.java | 4 +- .../opendj/ldap/tools/PerformanceRunner.java | 5 +- .../opendj/rest2ldap/RequestState.java | 16 +- 105 files changed, 287 insertions(+), 1248 deletions(-) diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java index 0cbaf9486..4a61751bc 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentGroup.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2008 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -50,7 +50,6 @@ public ArgumentGroup(final LocalizableMessage description, final int priority) { this.priority = priority; } - /** {@inheritDoc} */ @Override public int compareTo(final ArgumentGroup o) { // Groups with higher priority numbers appear before @@ -92,7 +91,7 @@ public boolean addArgument(final Argument arg) { * @return boolean where true means this group contains members */ boolean containsArguments() { - return this.args.size() > 0; + return !args.isEmpty(); } /** @@ -148,7 +147,6 @@ void setDescription(final LocalizableMessage description) { this.description = description; } - /** {@inheritDoc} */ @Override public String toString() { return getClass().getSimpleName() + "(description=" + description + ")"; diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java index 369ffb918..ed425320b 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TabSeparatedTablePrinter.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2008 Sun Microsystems, Inc. - * Portions Copyright 2014 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -29,10 +29,7 @@ * a single space. */ public final class TabSeparatedTablePrinter extends TablePrinter { - - /** - * Table serializer implementation. - */ + /** Table serializer implementation. */ private final class Serializer extends TableSerializer { /** * Counts the number of separators that should be output the next time a non-empty cell is displayed. The tab @@ -45,7 +42,6 @@ private Serializer() { // No implementation required. } - /** {@inheritDoc} */ @Override public void addCell(String s) { // Avoid printing tab separators for trailing empty cells. @@ -62,7 +58,6 @@ public void addCell(String s) { writer.print(s.replaceAll("[\\t\\n\\r]", " ")); } - /** {@inheritDoc} */ @Override public void addHeading(String s) { if (displayHeadings) { @@ -70,7 +65,6 @@ public void addHeading(String s) { } } - /** {@inheritDoc} */ @Override public void endHeader() { if (displayHeadings) { @@ -78,25 +72,21 @@ public void endHeader() { } } - /** {@inheritDoc} */ @Override public void endRow() { writer.println(); } - /** {@inheritDoc} */ @Override public void endTable() { writer.flush(); } - /** {@inheritDoc} */ @Override public void startHeader() { requiredSeparators = 0; } - /** {@inheritDoc} */ @Override public void startRow() { requiredSeparators = 0; @@ -140,10 +130,8 @@ public void setDisplayHeadings(boolean displayHeadings) { this.displayHeadings = displayHeadings; } - /** {@inheritDoc} */ @Override protected TableSerializer getSerializer() { return new Serializer(); } - } diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java index 7620bb997..f7fce40cb 100644 --- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java +++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/TextTablePrinter.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2007-2008 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -32,12 +32,8 @@ * Tables have configurable column widths, padding, and column separators. */ public final class TextTablePrinter extends TablePrinter { - - /** - * Table serializer implementation. - */ + /** Table serializer implementation. */ private final class Serializer extends TableSerializer { - /**The real column widths taking into account size constraints but not including padding or separators.*/ private final List columnWidths = new ArrayList<>(); @@ -61,20 +57,17 @@ private Serializer() { this.indentPadding = builder.toString(); } - /** {@inheritDoc} */ @Override public void addCell(String s) { currentRow.add(s); } - /** {@inheritDoc} */ @Override public void addColumn(int width) { columnWidths.add(width); totalColumns++; } - /** {@inheritDoc} */ @Override public void addHeading(String s) { if (displayHeadings) { @@ -82,7 +75,6 @@ public void addHeading(String s) { } } - /** {@inheritDoc} */ @Override public void endHeader() { if (displayHeadings) { @@ -123,7 +115,6 @@ public void endHeader() { } } - /** {@inheritDoc} */ @Override public void endRow() { boolean isRemainingText; @@ -148,7 +139,6 @@ public void endRow() { endIndex = width; head = contents.substring(0, endIndex); tail = contents.substring(endIndex); - } else { head = contents.substring(0, endIndex); tail = contents.substring(endIndex + 1); @@ -194,24 +184,20 @@ public void endRow() { // Output the line. writer.println(builder.toString()); - } while (isRemainingText); } - /** {@inheritDoc} */ @Override public void endTable() { writer.flush(); } - /** {@inheritDoc} */ @Override public void startHeader() { determineColumnWidths(); currentRow.clear(); } - /** {@inheritDoc} */ @Override public void startRow() { currentRow.clear(); @@ -302,10 +288,7 @@ private void determineColumnWidths() { /** The number of characters the table should be indented. */ private int indentWidth; - /** - * The character which should be used to separate the table - * heading row from the rows beneath. - */ + /** The character which should be used to separate the table heading row from the rows beneath. */ private char headingSeparator = DEFAULT_HEADING_SEPARATOR; /** The column where the heading separator should begin. */ @@ -317,10 +300,7 @@ private void determineColumnWidths() { */ private int padding = DEFAULT_PADDING; - /** - * Total permitted width for the table which expandable columns - * can use up. - */ + /** Total permitted width for the table which expandable columns can use up. */ private int totalWidth = MAX_LINE_WIDTH; /** The output destination. */ @@ -462,7 +442,6 @@ public void setTotalWidth(int totalWidth) { this.totalWidth = totalWidth; } - /** {@inheritDoc} */ @Override protected TableSerializer getSerializer() { return new Serializer(); diff --git a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java index 173c7004d..1f537e285 100644 --- a/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java +++ b/opendj-cli/src/test/java/com/forgerock/opendj/cli/ConsoleApplicationTestCase.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.cli; @@ -26,19 +26,14 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; -/** - * Unit tests for the console application class. - */ +/** Unit tests for the console application class. */ @SuppressWarnings("javadoc") public class ConsoleApplicationTestCase extends CliTestCase { - final LocalizableMessage msg = LocalizableMessage.raw("Language is the source of misunderstandings."); final LocalizableMessage msg2 = LocalizableMessage .raw("If somebody wants a sheep, that is a proof that one exists."); - /** - * For test purposes only. - */ + /** For test purposes only. */ private static class MockConsoleApplication extends ConsoleApplication { private static ByteArrayOutputStream out; private static ByteArrayOutputStream err; @@ -66,19 +61,16 @@ public String getErr() throws UnsupportedEncodingException { return err.toString("UTF-8"); } - /** {@inheritDoc} */ @Override public boolean isVerbose() { return verbose; } - /** {@inheritDoc} */ @Override public boolean isInteractive() { return interactive; } - /** {@inheritDoc} */ @Override public boolean isQuiet() { return quiet; diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java index 2287ae4ee..6341b744e 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2013 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package com.forgerock.opendj.ldap.extensions; import java.io.IOException; @@ -65,13 +64,11 @@ public int getConnectionID() { return connectionID; } - /** {@inheritDoc} */ @Override public String getOID() { return GetConnectionIDExtendedRequest.OID; } - /** {@inheritDoc} */ @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(6); @@ -87,7 +84,6 @@ public ByteString getValue() { return buffer.toByteString(); } - /** {@inheritDoc} */ @Override public boolean hasValue() { return true; @@ -105,7 +101,6 @@ public GetConnectionIDExtendedResult setConnectionID(final int connectionID) { return this; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java index 18f35e8d8..7958b97dd 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java @@ -39,14 +39,11 @@ import org.forgerock.opendj.ldap.responses.ExtendedResultDecoder; import org.forgerock.opendj.ldap.responses.Responses; -/** - * Get symmetric key extended request. - */ +/** Get symmetric key extended request. */ public final class GetSymmetricKeyExtendedRequest extends AbstractExtendedRequest { private static final class RequestDecoder implements ExtendedRequestDecoder { - @Override public GetSymmetricKeyExtendedRequest decodeExtendedRequest( final ExtendedRequest request, final DecodeOptions options) @@ -92,7 +89,6 @@ public GetSymmetricKeyExtendedRequest decodeExtendedRequest( } private static final class ResultDecoder extends AbstractExtendedResultDecoder { - @Override public ExtendedResult newExtendedErrorResult(final ResultCode resultCode, final String matchedDN, final String diagnosticMessage) { @@ -109,28 +105,14 @@ public ExtendedResult decodeExtendedResult(final ExtendedResult result, private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The request OID for the get symmetric key extended operation. - */ + /** The request OID for the get symmetric key extended operation. */ public static final String OID = "1.3.6.1.4.1.26027.1.6.3"; - - /** - * The BER type value for the symmetric key element of the operation value. - */ + /** The BER type value for the symmetric key element of the operation value. */ private static final byte TYPE_SYMMETRIC_KEY_ELEMENT = (byte) 0x80; - - /** - * The BER type value for the instance key ID element of the operation - * value. - */ + /** The BER type value for the instance key ID element of the operation value. */ private static final byte TYPE_INSTANCE_KEY_ID_ELEMENT = (byte) 0x81; - - /** - * A decoder which can be used to decode get symmetric key extended - * operation requests. - */ + /** A decoder which can be used to decode get symmetric key extended operation requests. */ public static final RequestDecoder REQUEST_DECODER = new RequestDecoder(); - /** No need to expose this. */ private static final ResultDecoder RESULT_DECODER = new ResultDecoder(); @@ -159,7 +141,6 @@ public String getInstanceKeyID() { return instanceKeyID; } - /** {@inheritDoc} */ @Override public String getOID() { return OID; @@ -174,13 +155,11 @@ public String getRequestSymmetricKey() { return requestSymmetricKey; } - /** {@inheritDoc} */ @Override public ExtendedResultDecoder getResultDecoder() { return RESULT_DECODER; } - /** {@inheritDoc} */ @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); @@ -203,7 +182,6 @@ public ByteString getValue() { return buffer.toByteString(); } - /** {@inheritDoc} */ @Override public boolean hasValue() { return true; @@ -233,7 +211,6 @@ public GetSymmetricKeyExtendedRequest setRequestSymmetricKey(final String reques return this; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java index 4943507b0..c947b407c 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package com.forgerock.opendj.ldap.extensions; import java.io.IOException; @@ -140,7 +139,6 @@ public Iterable getValues() { return values; } - /** {@inheritDoc} */ @Override public String toString() { return property + ": " + values; @@ -150,7 +148,6 @@ public String toString() { private static final class RequestDecoder implements ExtendedRequestDecoder { - @Override public PasswordPolicyStateExtendedRequest decodeExtendedRequest( final ExtendedRequest request, final DecodeOptions options) @@ -186,8 +183,6 @@ public PasswordPolicyStateExtendedRequest decodeExtendedRequest( private static final class ResultDecoder extends AbstractExtendedResultDecoder { - - /** {@inheritDoc} */ @Override public PasswordPolicyStateExtendedResult newExtendedErrorResult( final ResultCode resultCode, final String matchedDN, final String diagnosticMessage) { @@ -273,10 +268,7 @@ public PasswordPolicyStateExtendedResult decodeExtendedResult(final ExtendedResu "Seconds Until Required Change Time"; static final String PASSWORD_HISTORY_NAME = "Password History"; - /** - * A decoder which can be used to decode password policy state extended - * operation requests. - */ + /** A decoder which can be used to decode password policy state extended operation requests. */ public static final RequestDecoder REQUEST_DECODER = new RequestDecoder(); /** No need to expose this. */ @@ -352,9 +344,7 @@ private static void decodeOperations(final ASN1Reader reader, } } - /** - * Creates a new password policy state extended request. - */ + /** Creates a new password policy state extended request. */ public PasswordPolicyStateExtendedRequest() { // Nothing to do. } @@ -379,256 +369,189 @@ public void addGraceLoginUseTime(final Date date) { setDateProperty(ADD_GRACE_LOGIN_USE_TIME, date); } - /** {@inheritDoc} */ @Override public void addOperation(final PasswordPolicyStateOperation operation) { operations.add(operation); } - /** - * Clears the account disabled state. - */ + /** Clears the account disabled state. */ public void clearAccountDisabledState() { operations.add(PasswordPolicyStateOperationType.CLEAR_ACCOUNT_DISABLED_STATE); } - /** - * Clears the account expiration time. - */ + /** Clears the account expiration time. */ public void clearAccountExpirationTime() { operations.add(PasswordPolicyStateOperationType.CLEAR_ACCOUNT_EXPIRATION_TIME); } - /** - * Clears the authentication failure times. - */ + /** Clears the authentication failure times. */ public void clearAuthenticationFailureTimes() { operations.add(PasswordPolicyStateOperationType.CLEAR_AUTHENTICATION_FAILURE_TIMES); } - /** - * Clears the grace login use times. - */ + /** Clears the grace login use times. */ public void clearGraceLoginUseTimes() { operations.add(PasswordPolicyStateOperationType.CLEAR_GRACE_LOGIN_USE_TIMES); } - /** - * Clears the last login time. - */ + /** Clears the last login time. */ public void clearLastLoginTime() { operations.add(PasswordPolicyStateOperationType.CLEAR_LAST_LOGIN_TIME); } - /** - * Clears the password changed by required time. - */ + /** Clears the password changed by required time. */ public void clearPasswordChangedByRequiredTime() { operations.add(PasswordPolicyStateOperationType.CLEAR_PASSWORD_CHANGED_BY_REQUIRED_TIME); } - /** - * Clears the password changed time. - */ + /** Clears the password changed time. */ public void clearPasswordChangedTime() { operations.add(PasswordPolicyStateOperationType.CLEAR_PASSWORD_CHANGED_TIME); } - /** - * Clears the password expiration warned time. - */ + /** Clears the password expiration warned time. */ public void clearPasswordExpirationWarnedTime() { operations.add(PasswordPolicyStateOperationType.CLEAR_PASSWORD_EXPIRATION_WARNED_TIME); } - /** - * Clears the password history. - */ + /** Clears the password history. */ public void clearPasswordHistory() { operations.add(PasswordPolicyStateOperationType.CLEAR_PASSWORD_HISTORY); } - /** - * Clears the password reset state. - */ + /** Clears the password reset state. */ public void clearPasswordResetState() { operations.add(PasswordPolicyStateOperationType.CLEAR_PASSWORD_RESET_STATE); } - /** {@inheritDoc} */ @Override public String getOID() { return OID; } - /** {@inheritDoc} */ @Override public Iterable getOperations() { return operations; } - /** {@inheritDoc} */ @Override public ExtendedResultDecoder getResultDecoder() { return RESULT_DECODER; } - /** {@inheritDoc} */ @Override public String getTargetUser() { return targetUser; } - /** {@inheritDoc} */ @Override public ByteString getValue() { return encode(targetUser, operations); } - /** {@inheritDoc} */ @Override public boolean hasValue() { return true; } - /** - * Returns the account disabled state. - */ + /** Returns the account disabled state. */ public void requestAccountDisabledState() { operations.add(PasswordPolicyStateOperationType.GET_ACCOUNT_DISABLED_STATE); } - /** - * Returns the account expiration time. - */ + /** Returns the account expiration time. */ public void requestAccountExpirationTime() { operations.add(PasswordPolicyStateOperationType.GET_ACCOUNT_EXPIRATION_TIME); } - /** - * Returns the authentication failure times. - */ + /** Returns the authentication failure times. */ public void requestAuthenticationFailureTimes() { operations.add(PasswordPolicyStateOperationType.GET_AUTHENTICATION_FAILURE_TIMES); } - /** - * Returns the grace login use times. - */ + /** Returns the grace login use times. */ public void requestGraceLoginUseTimes() { operations.add(PasswordPolicyStateOperationType.GET_GRACE_LOGIN_USE_TIMES); } - /** - * Returns the last login time. - */ + /** Returns the last login time. */ public void requestLastLoginTime() { operations.add(PasswordPolicyStateOperationType.GET_LAST_LOGIN_TIME); } - /** - * Returns the password changed by required time. - */ + /** Returns the password changed by required time. */ public void requestPasswordChangedByRequiredTime() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_CHANGED_BY_REQUIRED_TIME); } - /** - * Returns the password changed time. - */ + /** Returns the password changed time. */ public void requestPasswordChangedTime() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_CHANGED_TIME); } - /** - * Returns the password expiration warned time. - */ + /** Returns the password expiration warned time. */ public void requestPasswordExpirationWarnedTime() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_EXPIRATION_WARNED_TIME); } - /** - * Returns the password history. - */ + /** Returns the password history. */ public void requestPasswordHistory() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_HISTORY); } - /** - * Returns the password policy DN. - */ + /** Returns the password policy DN. */ public void requestPasswordPolicyDN() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_POLICY_DN); } - /** - * Returns the password reset state. - */ + /** Returns the password reset state. */ public void requestPasswordResetState() { operations.add(PasswordPolicyStateOperationType.GET_PASSWORD_RESET_STATE); } - /** - * Returns the remaining authentication failure count. - */ + /** Returns the remaining authentication failure count. */ public void requestRemainingAuthenticationFailureCount() { operations.add(PasswordPolicyStateOperationType.GET_REMAINING_AUTHENTICATION_FAILURE_COUNT); } - /** - * Returns the remaining grace login count. - */ + /** Returns the remaining grace login count. */ public void requestRemainingGraceLoginCount() { operations.add(PasswordPolicyStateOperationType.GET_REMAINING_GRACE_LOGIN_COUNT); } - /** - * Returns the seconds until account expiration. - */ + /** Returns the seconds until account expiration. */ public void requestSecondsUntilAccountExpiration() { operations.add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_ACCOUNT_EXPIRATION); } - /** - * Returns the seconds until authentication failure unlock. - */ + /** Returns the seconds until authentication failure unlock. */ public void requestSecondsUntilAuthenticationFailureUnlock() { operations .add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_AUTHENTICATION_FAILURE_UNLOCK); } - /** - * Returns the seconds until idle lockout. - */ + /** Returns the seconds until idle lockout. */ public void requestSecondsUntilIdleLockout() { operations.add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_IDLE_LOCKOUT); } - /** - * Returns the seconds until password expiration. - */ + /** Returns the seconds until password expiration. */ public void requestSecondsUntilPasswordExpiration() { operations.add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_PASSWORD_EXPIRATION); } - /** - * Returns the seconds until password expiration warning. - */ + /** Returns the seconds until password expiration warning. */ public void requestSecondsUntilPasswordExpirationWarning() { operations .add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_PASSWORD_EXPIRATION_WARNING); } - /** - * Returns the seconds until password reset lockout. - */ + /** Returns the seconds until password reset lockout. */ public void requestSecondsUntilPasswordResetLockout() { operations.add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_PASSWORD_RESET_LOCKOUT); } - /** - * Returns the seconds until required change time. - */ + /** Returns the seconds until required change time. */ public void requestSecondsUntilRequiredChangeTime() { operations.add(PasswordPolicyStateOperationType.GET_SECONDS_UNTIL_REQUIRED_CHANGE_TIME); } @@ -751,13 +674,11 @@ private ByteString toByteString(final Date date) { return ByteString.valueOfUtf8(formatAsGeneralizedTime(date)); } - /** {@inheritDoc} */ @Override public void setTargetUser(String targetUser) { this.targetUser = targetUser != null ? targetUser : ""; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java b/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java index a18368244..c5940e708 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2014-2015 ForgeRock AS. + * Portions Copyright 2014-2016 ForgeRock AS. */ package com.forgerock.opendj.util; @@ -25,13 +25,10 @@ import org.forgerock.util.Function; import org.forgerock.util.promise.NeverThrowsException; -/** - * Additional {@code Collection} based utility methods. - */ +/** Additional {@code Collection} based utility methods. */ public final class Collections2 { private static class TransformedCollection> extends AbstractCollection implements Collection { - protected final C collection; protected final Function funcMtoN; @@ -46,68 +43,57 @@ protected TransformedCollection(final C collection, this.funcNtoM = funcNtoM; } - /** {@inheritDoc} */ @Override public boolean add(final N e) { return collection.add(funcNtoM.apply(e)); } - /** {@inheritDoc} */ @Override public void clear() { collection.clear(); } - /** {@inheritDoc} */ @Override @SuppressWarnings("unchecked") public boolean contains(final Object o) { return collection.contains(funcNtoM.apply((N) o)); } - /** {@inheritDoc} */ @Override public boolean isEmpty() { return collection.isEmpty(); } - /** {@inheritDoc} */ @Override public Iterator iterator() { return Iterators.transformedIterator(collection.iterator(), funcMtoN); } - /** {@inheritDoc} */ @Override @SuppressWarnings("unchecked") public boolean remove(final Object o) { return collection.remove(funcNtoM.apply((N) o)); } - /** {@inheritDoc} */ @Override public int size() { return collection.size(); } - } private static final class TransformedList extends TransformedCollection> implements List { - private TransformedList(final List list, final Function funcMtoN, final Function funcNtoM) { super(list, funcMtoN, funcNtoM); } - /** {@inheritDoc} */ @Override public void add(final int index, final N element) { collection.add(index, funcNtoM.apply(element)); } - /** {@inheritDoc} */ @Override public boolean addAll(final int index, final Collection c) { // We cannot transform c here due to type-safety. @@ -118,33 +104,28 @@ public boolean addAll(final int index, final Collection c) { return result; } - /** {@inheritDoc} */ @Override public N get(final int index) { return funcMtoN.apply(collection.get(index)); } - /** {@inheritDoc} */ @Override @SuppressWarnings("unchecked") public int indexOf(final Object o) { return collection.indexOf(funcNtoM.apply((N) o)); } - /** {@inheritDoc} */ @Override @SuppressWarnings("unchecked") public int lastIndexOf(final Object o) { return collection.lastIndexOf(funcNtoM.apply((N) o)); } - /** {@inheritDoc} */ @Override public ListIterator listIterator() { return listIterator(0); } - /** {@inheritDoc} */ @Override public ListIterator listIterator(final int index) { final ListIterator iterator = collection.listIterator(index); @@ -198,26 +179,22 @@ public void set(final N e) { }; } - /** {@inheritDoc} */ @Override public N remove(final int index) { return funcMtoN.apply(collection.remove(index)); } - /** {@inheritDoc} */ @Override public N set(final int index, final N element) { final M result = collection.set(index, funcNtoM.apply(element)); return funcMtoN.apply(result); } - /** {@inheritDoc} */ @Override public List subList(final int fromIndex, final int toIndex) { final List subList = collection.subList(fromIndex, toIndex); return new TransformedList<>(subList, funcMtoN, funcNtoM); } - } /** @@ -280,5 +257,4 @@ public static List transformedList(final List list, private Collections2() { // Do nothing. } - } diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java b/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java index a24b22a6f..a7afa177d 100644 --- a/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java +++ b/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java @@ -12,15 +12,14 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2006-2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package com.forgerock.opendj.util; import java.io.IOException; import java.io.InputStream; -/** - * An implementation of input stream that enforces an read size limit. - */ +/** An implementation of input stream that enforces an read size limit. */ public class SizeLimitInputStream extends InputStream { private int bytesRead; private int markBytesRead; @@ -40,7 +39,6 @@ public SizeLimitInputStream(final InputStream parentStream, final int readLimit) this.readLimit = readLimit; } - /** {@inheritDoc} */ @Override public int available() throws IOException { final int streamAvail = parentStream.available(); @@ -48,7 +46,6 @@ public int available() throws IOException { return limitedAvail < streamAvail ? limitedAvail : streamAvail; } - /** {@inheritDoc} */ @Override public void close() throws IOException { parentStream.close(); @@ -72,20 +69,17 @@ public int getSizeLimit() { return readLimit; } - /** {@inheritDoc} */ @Override public synchronized void mark(final int readlimit) { parentStream.mark(readlimit); markBytesRead = bytesRead; } - /** {@inheritDoc} */ @Override public boolean markSupported() { return parentStream.markSupported(); } - /** {@inheritDoc} */ @Override public int read() throws IOException { if (bytesRead >= readLimit) { @@ -99,7 +93,6 @@ public int read() throws IOException { return b; } - /** {@inheritDoc} */ @Override public int read(final byte[] b, final int off, int len) throws IOException { if (off < 0 || len < 0 || off + len > b.length) { @@ -125,14 +118,12 @@ public int read(final byte[] b, final int off, int len) throws IOException { return readLen; } - /** {@inheritDoc} */ @Override public synchronized void reset() throws IOException { parentStream.reset(); bytesRead = markBytesRead; } - /** {@inheritDoc} */ @Override public long skip(long n) throws IOException { if (bytesRead + n > readLimit) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java index d952ebe38..397cb70f8 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2006-2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.io; @@ -29,9 +29,7 @@ import com.forgerock.opendj.util.StaticUtils; -/** - * An ASN1Writer implementation that outputs to an outputstream. - */ +/** An ASN1Writer implementation that outputs to an outputstream. */ final class ASN1OutputStreamWriter extends AbstractASN1Writer { /** Initial size of internal buffers. */ private static final int BUFFER_INIT_SIZE = 32; @@ -60,7 +58,6 @@ final class ASN1OutputStreamWriter extends AbstractASN1Writer { this.stackDepth = -1; } - /** {@inheritDoc} */ @Override public void close() throws IOException { while (stackDepth >= 0) { @@ -71,13 +68,11 @@ public void close() throws IOException { rootStream.close(); } - /** {@inheritDoc} */ @Override public void flush() throws IOException { rootStream.flush(); } - /** {@inheritDoc} */ @Override public ASN1Writer writeBoolean(final byte type, final boolean booleanValue) throws IOException { out.write(type); @@ -88,7 +83,6 @@ public ASN1Writer writeBoolean(final byte type, final boolean booleanValue) thro return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeEndSequence() throws IOException { if (stackDepth < 0) { @@ -116,19 +110,16 @@ public ASN1Writer writeEndSequence() throws IOException { return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeEndSet() throws IOException { return writeEndSequence(); } - /** {@inheritDoc} */ @Override public ASN1Writer writeEnumerated(final byte type, final int intValue) throws IOException { return writeInteger(type, intValue); } - /** {@inheritDoc} */ @Override public ASN1Writer writeInteger(final byte type, final int intValue) throws IOException { out.write(type); @@ -161,7 +152,6 @@ public ASN1Writer writeInteger(final byte type, final int intValue) throws IOExc return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeInteger(final byte type, final long longValue) throws IOException { out.write(type); @@ -236,7 +226,6 @@ public ASN1Writer writeInteger(final byte type, final long longValue) throws IOE return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeNull(final byte type) throws IOException { out.write(type); @@ -246,7 +235,6 @@ public ASN1Writer writeNull(final byte type) throws IOException { return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeOctetString(final byte type, final byte[] value, final int offset, final int length) throws IOException { @@ -258,7 +246,6 @@ public ASN1Writer writeOctetString(final byte type, final byte[] value, final in return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeOctetString(final byte type, final ByteSequence value) throws IOException { @@ -270,7 +257,6 @@ public ASN1Writer writeOctetString(final byte type, final ByteSequence value) return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeOctetString(final byte type, final String value) throws IOException { out.write(type); @@ -288,7 +274,6 @@ public ASN1Writer writeOctetString(final byte type, final String value) throws I return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeStartSequence(final byte type) throws IOException { // Write the type in current stream switch to next sub-stream @@ -310,7 +295,6 @@ public ASN1Writer writeStartSequence(final byte type) throws IOException { return this; } - /** {@inheritDoc} */ @Override public ASN1Writer writeStartSet(final byte type) throws IOException { // From an implementation point of view, a set is equivalent to a diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java index 5a1839ace..a29ba8589 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import org.forgerock.opendj.ldap.requests.AddRequest; @@ -37,58 +36,47 @@ * asynchronous methods. */ public abstract class AbstractAsynchronousConnection extends AbstractConnection { - - /** - * Creates a new abstract asynchronous connection. - */ + /** Creates a new abstract asynchronous connection. */ protected AbstractAsynchronousConnection() { // No implementation required. } - /** {@inheritDoc} */ @Override public Result add(final AddRequest request) throws LdapException { return blockingGetOrThrow(addAsync(request)); } - /** {@inheritDoc} */ @Override public BindResult bind(final BindRequest request) throws LdapException { return blockingGetOrThrow(bindAsync(request)); } - /** {@inheritDoc} */ @Override public CompareResult compare(final CompareRequest request) throws LdapException { return blockingGetOrThrow(compareAsync(request)); } - /** {@inheritDoc} */ @Override public Result delete(final DeleteRequest request) throws LdapException { return blockingGetOrThrow(deleteAsync(request)); } - /** {@inheritDoc} */ @Override public R extendedRequest(final ExtendedRequest request, final IntermediateResponseHandler handler) throws LdapException { return blockingGetOrThrow(extendedRequestAsync(request, handler)); } - /** {@inheritDoc} */ @Override public Result modify(final ModifyRequest request) throws LdapException { return blockingGetOrThrow(modifyAsync(request)); } - /** {@inheritDoc} */ @Override public Result modifyDN(final ModifyDNRequest request) throws LdapException { return blockingGetOrThrow(modifyDNAsync(request)); } - /** {@inheritDoc} */ @Override public Result search(final SearchRequest request, final SearchResultHandler handler) throws LdapException { return blockingGetOrThrow(searchAsync(request, handler)); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java index 8e725ef50..c039f34fe 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.Collection; @@ -53,7 +52,6 @@ * interface, to minimize the effort required to implement this interface. */ public abstract class AbstractConnection implements Connection { - private static final class SingleEntryHandler implements SearchResultHandler { private volatile SearchResultEntry firstEntry; private volatile SearchResultReference firstReference; @@ -166,9 +164,7 @@ public Object visitChangeRecord(final Connection p, final ModifyRequest change) } }; - /** - * Creates a new abstract connection. - */ + /** Creates a new abstract connection. */ protected AbstractConnection() { // No implementation required. } @@ -441,5 +437,4 @@ private SearchRequest enforceSingleEntrySearchRequest(final SearchRequest reques */ @Override public abstract String toString(); - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java index 092e64066..126a0f319 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2014 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.Collection; @@ -50,9 +49,7 @@ * The type of wrapped connection. */ public abstract class AbstractConnectionWrapper implements Connection { - /** - * The wrapped connection. - */ + /** The wrapped connection. */ protected final C connection; /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java index ee0534ca1..33ec38c4a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java @@ -14,7 +14,6 @@ * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.List; @@ -35,10 +34,7 @@ * additional parameter. */ public abstract class AbstractFilterVisitor implements FilterVisitor { - - /** - * Default constructor. - */ + /** Default constructor. */ protected AbstractFilterVisitor() { // Nothing to do. } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java index bcdf5cd44..5cb8d3d1e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -21,9 +21,7 @@ import org.forgerock.util.Reject; -/** - * Abstract implementation for {@code Map} based entries. - */ +/** Abstract implementation for {@code Map} based entries. */ abstract class AbstractMapEntry extends AbstractEntry { private final Map attributes; private DN name; @@ -42,7 +40,6 @@ abstract class AbstractMapEntry extends AbstractEntry { this.attributes = attributes; } - /** {@inheritDoc} */ @Override public final boolean addAttribute(final Attribute attribute, final Collection duplicateValues) { @@ -56,20 +53,17 @@ public final boolean addAttribute(final Attribute attribute, } } - /** {@inheritDoc} */ @Override public final Entry clearAttributes() { attributes.clear(); return this; } - /** {@inheritDoc} */ @Override public final Iterable getAllAttributes() { return attributes.values(); } - /** {@inheritDoc} */ @Override public final Attribute getAttribute(final AttributeDescription attributeDescription) { final Attribute attribute = attributes.get(attributeDescription); @@ -81,19 +75,16 @@ public final Attribute getAttribute(final AttributeDescription attributeDescript } } - /** {@inheritDoc} */ @Override public final int getAttributeCount() { return attributes.size(); } - /** {@inheritDoc} */ @Override public final DN getName() { return name; } - /** {@inheritDoc} */ @Override public final boolean removeAttribute(final Attribute attribute, final Collection missingValues) { @@ -123,12 +114,10 @@ public final boolean removeAttribute(final Attribute attribute, } } - /** {@inheritDoc} */ @Override public final Entry setName(final DN dn) { Reject.ifNull(dn); this.name = dn; return this; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java index 72ee665cf..c3286822f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java @@ -11,9 +11,8 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2012-2014 ForgeRock AS. + * Copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import org.forgerock.opendj.ldap.requests.AbandonRequest; @@ -41,10 +40,7 @@ * the equivalent synchronous methods. */ public abstract class AbstractSynchronousConnection extends AbstractConnection { - - /** - * Creates a new abstract synchronous connection. - */ + /** Creates a new abstract synchronous connection. */ protected AbstractSynchronousConnection() { // No implementation required. } @@ -154,5 +150,4 @@ private LdapPromise onException(final LdapException e) { private LdapPromise thenOnResult(final R result) { return newSuccessfulLdapPromise(result); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java index 63b504a48..de0a469d9 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java @@ -33,11 +33,8 @@ import com.forgerock.opendj.util.StaticUtils; -/** - * An immutable sequence of bytes backed by a byte array. - */ +/** An immutable sequence of bytes backed by a byte array. */ public final class ByteString implements ByteSequence { - /** Singleton empty byte string. */ private static final ByteString EMPTY = wrap(new byte[0]); @@ -626,7 +623,6 @@ public ByteSequenceReader asReader() { return new ByteSequenceReader(this); } - /** {@inheritDoc} */ @Override public byte byteAt(final int index) { if (index >= length || index < 0) { @@ -635,14 +631,12 @@ public byte byteAt(final int index) { return buffer[offset + index]; } - /** {@inheritDoc} */ @Override public int compareTo(final byte[] bytes, final int offset, final int length) { checkArrayBounds(bytes, offset, length); return compareTo(this.buffer, this.offset, this.length, bytes, offset, length); } - /** {@inheritDoc} */ @Override public int compareTo(final ByteSequence o) { if (this == o) { @@ -651,14 +645,12 @@ public int compareTo(final ByteSequence o) { return -o.compareTo(buffer, offset, length); } - /** {@inheritDoc} */ @Override public byte[] copyTo(final byte[] bytes) { copyTo(bytes, 0); return bytes; } - /** {@inheritDoc} */ @Override public byte[] copyTo(final byte[] bytes, final int offset) { if (offset < 0) { @@ -680,7 +672,6 @@ public ByteStringBuilder copyTo(final ByteStringBuilder builder) { return builder; } - @Override public boolean copyTo(CharBuffer charBuffer, CharsetDecoder decoder) { return copyTo(ByteBuffer.wrap(buffer, offset, length), charBuffer, decoder); @@ -698,14 +689,12 @@ static boolean copyTo(ByteBuffer inBuffer, CharBuffer outBuffer, CharsetDecoder return !result.isError() && !result.isOverflow(); } - /** {@inheritDoc} */ @Override public OutputStream copyTo(final OutputStream stream) throws IOException { stream.write(buffer, offset, length); return stream; } - /** {@inheritDoc} */ @Override public boolean equals(final byte[] bytes, final int offset, final int length) { checkArrayBounds(bytes, offset, length); @@ -751,13 +740,11 @@ public boolean isEmpty() { return length == 0; } - /** {@inheritDoc} */ @Override public int length() { return length; } - /** {@inheritDoc} */ @Override public ByteString subSequence(final int start, final int end) { if (start < 0 || start > end || end > length) { @@ -766,16 +753,11 @@ public ByteString subSequence(final int start, final int end) { return new ByteString(buffer, offset + start, end - start); } - /** {@inheritDoc} */ @Override public boolean startsWith(ByteSequence prefix) { - if (prefix == null || prefix.length() > length) { - return false; - } - return prefix.equals(buffer, 0, prefix.length()); + return prefix != null && prefix.length() <= length && prefix.equals(buffer, 0, prefix.length()); } - /** {@inheritDoc} */ @Override public String toBase64String() { return Base64.encode(this); @@ -900,13 +882,11 @@ public String toHexPlusAsciiString(int indent) { return builder.toString(); } - /** {@inheritDoc} */ @Override public byte[] toByteArray() { return copyTo(new byte[length]); } - /** {@inheritDoc} */ @Override public ByteString toByteString() { return this; @@ -971,7 +951,6 @@ public long toLong() { return v; } - /** {@inheritDoc} */ @Override public String toString() { return toString(buffer, offset, length); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java index b86d84d38..7a4a588b3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java @@ -12,8 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.Arrays; @@ -61,10 +61,7 @@ public final class DereferenceAliasesPolicy { */ public static final DereferenceAliasesPolicy FINDING_BASE = register(2, "find"); - /** - * Dereference aliases both in searching and in locating the base object of - * a Search operation. - */ + /** Dereference aliases both in searching and in locating the base object of a Search operation. */ public static final DereferenceAliasesPolicy ALWAYS = register(3, "always"); /** @@ -122,7 +119,6 @@ private DereferenceAliasesPolicy(final int intValue, final String name) { this.name = name; } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -134,7 +130,6 @@ public boolean equals(final Object obj) { } } - /** {@inheritDoc} */ @Override public int hashCode() { return intValue; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java index de3374595..7af499813 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -63,10 +63,7 @@ public final class Entries { * @see Entries#diffEntries(Entry, Entry, DiffOptions) */ public static final class DiffOptions { - /** - * Selects which attributes will be compared. By default all user - * attributes will be compared. - */ + /** Selects which attributes will be compared. By default all user attributes will be compared. */ private AttributeFilter attributeFilter = USER_ATTRIBUTES_ONLY_FILTER; /** @@ -188,7 +185,6 @@ private DiffOptions replaceMaxValues(final int maxValues) { private Entry filter(final Entry entry) { return attributeFilter.filteredViewOf(entry); } - } private static final class UnmodifiableEntry implements Entry { @@ -198,20 +194,17 @@ private UnmodifiableEntry(final Entry entry) { this.entry = entry; } - /** {@inheritDoc} */ @Override public boolean addAttribute(final Attribute attribute) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public boolean addAttribute(final Attribute attribute, final Collection duplicateValues) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public Entry addAttribute(final String attributeDescription, final Object... values) { throw new UnsupportedOperationException(); @@ -233,7 +226,6 @@ public boolean containsAttribute(final String attributeDescription, final Object return entry.containsAttribute(attributeDescription, values); } - /** {@inheritDoc} */ @Override public boolean equals(final Object object) { return object == this || entry.equals(object); @@ -251,7 +243,6 @@ public Iterable getAllAttributes(final AttributeDescription attribute .getAllAttributes(attributeDescription), UNMODIFIABLE_ATTRIBUTE_FUNCTION)); } - /** {@inheritDoc} */ @Override public Iterable getAllAttributes(final String attributeDescription) { return Iterables.unmodifiableIterable(Iterables.transformedIterable(entry @@ -268,7 +259,6 @@ public Attribute getAttribute(final AttributeDescription attributeDescription) { } } - /** {@inheritDoc} */ @Override public Attribute getAttribute(final String attributeDescription) { final Attribute attribute = entry.getAttribute(attributeDescription); @@ -284,31 +274,26 @@ public int getAttributeCount() { return entry.getAttributeCount(); } - /** {@inheritDoc} */ @Override public DN getName() { return entry.getName(); } - /** {@inheritDoc} */ @Override public int hashCode() { return entry.hashCode(); } - /** {@inheritDoc} */ @Override public AttributeParser parseAttribute(final AttributeDescription attributeDescription) { return entry.parseAttribute(attributeDescription); } - /** {@inheritDoc} */ @Override public AttributeParser parseAttribute(final String attributeDescription) { return entry.parseAttribute(attributeDescription); } - /** {@inheritDoc} */ @Override public boolean removeAttribute(final Attribute attribute, final Collection missingValues) { @@ -320,19 +305,16 @@ public boolean removeAttribute(final AttributeDescription attributeDescription) throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public Entry removeAttribute(final String attributeDescription, final Object... values) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public boolean replaceAttribute(final Attribute attribute) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public Entry replaceAttribute(final String attributeDescription, final Object... values) { throw new UnsupportedOperationException(); @@ -343,18 +325,15 @@ public Entry setName(final DN dn) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public Entry setName(final String dn) { throw new UnsupportedOperationException(); } - /** {@inheritDoc} */ @Override public String toString() { return entry.toString(); } - } private static final Comparator COMPARATOR = new Comparator() { @@ -591,10 +570,7 @@ public static ModifyRequest diffEntries(final Entry fromEntry, final Entry toEnt final int cmp = adfrom.compareTo(adto); if (cmp == 0) { - /* - * Attribute is in both entries so compute the differences - * between the old and new. - */ + /* Attribute is in both entries so compute the differences between the old and new. */ if (options.useReplaceMaxValues > ato.size()) { // This attribute is a candidate for replacing. if (diffAttributeNeedsReplacing(afrom, ato, options)) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java index d68dffb94..66218beed 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2012-2015 ForgeRock AS. + * Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -44,7 +44,6 @@ * Rules */ public final class GeneralizedTime implements Comparable { - /** UTC TimeZone is assumed to never change over JVM lifetime. */ private static final TimeZone TIME_ZONE_UTC_OBJ = TimeZone.getTimeZone("UTC"); @@ -808,7 +807,6 @@ private GeneralizedTime(final Calendar calendar, final Date date, final long tim this.stringValue = stringValue; } - /** {@inheritDoc} */ @Override public int compareTo(final GeneralizedTime o) { final Long timeMS1 = getTimeInMillis(); @@ -816,7 +814,6 @@ public int compareTo(final GeneralizedTime o) { return timeMS1.compareTo(timeMS2); } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -848,7 +845,6 @@ public long getTimeInMillis() { return tmpTimeMS; } - /** {@inheritDoc} */ @Override public int hashCode() { return ((Long) getTimeInMillis()).hashCode(); @@ -883,7 +879,6 @@ public Date toDate() { return (Date) tmpDate.clone(); } - /** {@inheritDoc} */ @Override public String toString() { String tmpString = stringValue; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java index f0b3951f8..f30d9a020 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -91,114 +91,70 @@ public final class LDAPUrl { */ private final boolean isSecured; - /** - * The host name corresponding to an LDAP URL. - */ + /** The host name corresponding to an LDAP URL. */ private final String host; - /** - * The port number corresponding to an LDAP URL. - */ + /** The port number corresponding to an LDAP URL. */ private final int port; - /** - * The distinguished name corresponding to an LDAP URL. - */ + /** The distinguished name corresponding to an LDAP URL. */ private final DN name; - /** - * The search scope corresponding to an LDAP URL. - */ + /** The search scope corresponding to an LDAP URL. */ private final SearchScope scope; - /** - * The search filter corresponding to an LDAP URL. - */ + /** The search filter corresponding to an LDAP URL. */ private final Filter filter; - /** - * The attributes that need to be searched. - */ + /** The attributes that need to be searched. */ private final List attributes; - /** - * The String value of LDAP URL. - */ + /** The String value of LDAP URL. */ private final String urlString; - /** - * Normalized ldap URL. - */ + /** Normalized ldap URL. */ private String normalizedURL; - /** - * The default scheme to be used with LDAP URL. - */ + /** The default scheme to be used with LDAP URL. */ private static final String DEFAULT_URL_SCHEME = "ldap"; - /** - * The SSL-based scheme allowed to be used with LDAP URL. - */ + /** The SSL-based scheme allowed to be used with LDAP URL. */ private static final String SSL_URL_SCHEME = "ldaps"; - /** - * The default host. - */ + /** The default host. */ private static final String DEFAULT_HOST = "localhost"; - /** - * The default non-SSL port. - */ + /** The default non-SSL port. */ private static final int DEFAULT_PORT = 389; - /** - * The default SSL port. - */ + /** The default SSL port. */ private static final int DEFAULT_SSL_PORT = 636; - /** - * The default filter. - */ + /** The default filter. */ private static final Filter DEFAULT_FILTER = Filter.objectClassPresent(); - /** - * The default search scope. - */ + /** The default search scope. */ private static final SearchScope DEFAULT_SCOPE = SearchScope.BASE_OBJECT; - /** - * The default distinguished name. - */ + /** The default distinguished name. */ private static final DN DEFAULT_DN = DN.rootDN(); - /** - * The % encoding character. - */ + /** The % encoding character. */ private static final char PERCENT_ENCODING_CHAR = '%'; - /** - * The ? character. - */ + /** The ? character. */ private static final char QUESTION_CHAR = '?'; - /** - * The slash (/) character. - */ + /** The slash (/) character. */ private static final char SLASH_CHAR = '/'; - /** - * The comma (,) character. - */ + /** The comma (,) character. */ private static final char COMMA_CHAR = ','; - /** - * The colon (:) character. - */ + /** The colon (:) character. */ private static final char COLON_CHAR = ':'; - /** - * Set containing characters that do not need to be encoded. - */ + /** Set containing characters that do not need to be encoded. */ private static final Set VALID_CHARS = new HashSet<>(); static { @@ -617,7 +573,6 @@ public SearchRequest asSearchRequest() { return request; } - /** {@inheritDoc} */ @Override public boolean equals(final Object o) { if (o == this) { @@ -694,7 +649,6 @@ public SearchScope getScope() { return scope; } - /** {@inheritDoc} */ @Override public int hashCode() { final String s = toNormalizedString(); @@ -712,7 +666,6 @@ public boolean isSecure() { return isSecured; } - /** {@inheritDoc} */ @Override public String toString() { return urlString; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java index d37d31c3c..1f9818351 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.Collection; @@ -44,7 +43,6 @@ public final class LinkedAttribute extends AbstractAttribute { private static abstract class Impl { - abstract boolean add(LinkedAttribute attribute, ByteString value); abstract void clear(LinkedAttribute attribute); @@ -75,7 +73,6 @@ abstract boolean retainAll(LinkedAttribute attribute, Collection values, } private static final class MultiValueImpl extends Impl { - @Override boolean add(final LinkedAttribute attribute, final ByteString value) { final ByteString normalizedValue = normalizeValue(attribute, value); @@ -218,7 +215,6 @@ private void resize(final LinkedAttribute attribute) { } private static final class SingleValueImpl extends Impl { - @Override boolean add(final LinkedAttribute attribute, final ByteString value) { final ByteString normalizedValue = normalizeValue(attribute, value); @@ -348,7 +344,6 @@ int size(final LinkedAttribute attribute) { } private static final class ZeroValueImpl extends Impl { - @Override boolean add(final LinkedAttribute attribute, final ByteString value) { attribute.singleValue = value; @@ -423,12 +418,9 @@ boolean retainAll(final LinkedAttribute attribute, final Collection value int size(final LinkedAttribute attribute) { return 0; } - } - /** - * An attribute factory which can be used to create new linked attributes. - */ + /** An attribute factory which can be used to create new linked attributes. */ public static final AttributeFactory FACTORY = new AttributeFactory() { @Override public Attribute newAttribute(final AttributeDescription attributeDescription) { @@ -636,59 +628,50 @@ public LinkedAttribute(final String attributeDescription, final Object... values add(values); } - /** {@inheritDoc} */ @Override public boolean add(final ByteString value) { Reject.ifNull(value); return pimpl.add(this, value); } - /** {@inheritDoc} */ @Override public void clear() { pimpl.clear(this); } - /** {@inheritDoc} */ @Override public boolean contains(final Object value) { Reject.ifNull(value); return pimpl.contains(this, ByteString.valueOfObject(value)); } - /** {@inheritDoc} */ @Override public boolean containsAll(final Collection values) { Reject.ifNull(values); return pimpl.containsAll(this, values); } - /** {@inheritDoc} */ @Override public ByteString firstValue() { return pimpl.firstValue(this); } - /** {@inheritDoc} */ @Override public AttributeDescription getAttributeDescription() { return attributeDescription; } - /** {@inheritDoc} */ @Override public Iterator iterator() { return pimpl.iterator(this); } - /** {@inheritDoc} */ @Override public boolean remove(final Object value) { Reject.ifNull(value); return pimpl.remove(this, ByteString.valueOfObject(value)); } - /** {@inheritDoc} */ @Override public boolean retainAll(final Collection values, final Collection missingValues) { @@ -696,7 +679,6 @@ public boolean retainAll(final Collection values, return pimpl.retainAll(this, values, missingValues); } - /** {@inheritDoc} */ @Override public int size() { return pimpl.size(this); @@ -709,5 +691,4 @@ private ByteString normalizedSingleValue() { } return normalizedSingleValue; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java index 0fd6a7e1a..38717d881 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java @@ -12,15 +12,13 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import org.forgerock.util.Reject; -/** - * A modification to be performed on an entry during a Modify operation. - */ +/** A modification to be performed on an entry during a Modify operation. */ public final class Modification { private final ModificationType modificationType; private final Attribute attribute; @@ -66,7 +64,6 @@ public ModificationType getModificationType() { return modificationType; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -86,5 +83,4 @@ public String toString() { builder.append("})"); return builder.toString(); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java index 46ff4e9ef..eb530b205 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -29,7 +30,6 @@ * Directory Access Protocol (LDAP) Modify-Increment Extension */ public final class ModificationType { - /** * Contains equivalent values for the ModificationType values. * This allows easily using ModificationType values with switch statements. @@ -145,7 +145,6 @@ private ModificationType(final int intValue, final String name, final Enum modif this.modificationTypeEnum = modificationTypeEnum; } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -157,7 +156,6 @@ public boolean equals(final Object obj) { } } - /** {@inheritDoc} */ @Override public int hashCode() { return intValue; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java index fb192a53e..0100d3d06 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java @@ -11,9 +11,8 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2011-2015 ForgeRock AS. + * Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import static com.forgerock.opendj.ldap.CoreMessages.INFO_CANCELED_BY_ABANDON_REQUEST; @@ -62,16 +61,10 @@ * The type of client context. */ final class RequestHandlerFactoryAdapter implements ServerConnectionFactory { - /** - * Request context implementation. - */ + /** Request context implementation. */ private static class RequestContextImpl> implements RequestContext, LdapResultHandler { - - /** - * Adapter class which invokes cancel result handlers with correct - * result type. - */ + /** Adapter class which invokes cancel result handlers with correct result type. */ private static final class ExtendedResultHandlerHolder { private final ExtendedRequest request; private final LdapResultHandler resultHandler; @@ -136,7 +129,6 @@ protected RequestContextImpl(final ServerConnectionImpl clientConnection, this.isCancelSupported = isCancelSupported; } - /** {@inheritDoc} */ @Override public void addCancelRequestListener(final CancelRequestListener listener) { Reject.ifNull(listener); @@ -157,10 +149,7 @@ public void addCancelRequestListener(final CancelRequestListener listener) { case TOO_LATE: case RESULT_SENT: case CANCELLED: - /* - * No point in registering the callback since the request - * can never be cancelled now. - */ + /* No point in registering the callback since the request can never be cancelled now. */ break; } } @@ -170,7 +159,6 @@ public void addCancelRequestListener(final CancelRequestListener listener) { } } - /** {@inheritDoc} */ @Override public void checkIfCancelled(final boolean signalTooLate) throws CancelledResultException { synchronized (stateLock) { @@ -183,10 +171,7 @@ public void checkIfCancelled(final boolean signalTooLate) throws CancelledResult } break; case CANCEL_REQUESTED: - /* - * Don't change state: let the handler ack the cancellation - * request. - */ + /* Don't change state: let the handler ack the cancellation request. */ throw (CancelledResultException) newLdapException(ResultCode.CANCELLED, cancelRequestReason.toString()); case TOO_LATE: @@ -194,22 +179,17 @@ public void checkIfCancelled(final boolean signalTooLate) throws CancelledResult break; case RESULT_SENT: case CANCELLED: - /* - * This should not happen - could throw an illegal state - * exception? - */ + /* This should not happen - could throw an illegal state exception? */ break; } } } - /** {@inheritDoc} */ @Override public int getMessageID() { return messageID; } - /** {@inheritDoc} */ @Override public void handleException(final LdapException error) { if (clientConnection.removePendingRequest(this)) { @@ -225,7 +205,6 @@ public void handleException(final LdapException error) { } } - /** {@inheritDoc} */ @Override public void handleResult(final S result) { if (clientConnection.removePendingRequest(this)) { @@ -241,7 +220,6 @@ public void handleResult(final S result) { } } - /** {@inheritDoc} */ @Override public void removeCancelRequestListener(final CancelRequestListener listener) { Reject.ifNull(listener); @@ -287,9 +265,7 @@ private void cancel(final LocalizableMessage reason, this.sendResult &= sendResult; break; case CANCEL_REQUESTED: - /* - * Cancel already request so listeners already invoked. - */ + /* Cancel already request so listeners already invoked. */ if (cancelResultHandler != null) { if (cancelResultHandlers == null) { cancelResultHandlers = new LinkedList<>(); @@ -300,10 +276,7 @@ private void cancel(final LocalizableMessage reason, break; case TOO_LATE: case RESULT_SENT: - /* - * Cannot cancel, so invoke result handler immediately - * outside of lock. - */ + /* Cannot cancel, so invoke result handler immediately outside of lock. */ if (cancelResultHandler != null) { invokeResultHandler = true; resultHandlerIsSuccess = false; @@ -370,10 +343,7 @@ private boolean setResult(final Result result) { } break; case CANCEL_REQUESTED: - /* - * Switch to appropriate final state and invoke any cancel - * request handlers. - */ + /* Switch to appropriate final state and invoke any cancel request handlers. */ if (!result.getResultCode().equals(ResultCode.CANCELLED)) { state = RequestState.RESULT_SENT; } else { @@ -386,10 +356,7 @@ private boolean setResult(final Result result) { break; case RESULT_SENT: case CANCELLED: - /* - * This should not happen - could throw an illegal state - * exception? - */ + /* This should not happen - could throw an illegal state exception? */ maySendResult = false; // Prevent sending multiple results. break; } @@ -410,9 +377,7 @@ private boolean setResult(final Result result) { } } - /** - * Search request context implementation. - */ + /** Search request context implementation. */ private static final class SearchRequestContextImpl extends RequestContextImpl> implements SearchResultHandler { @@ -425,13 +390,11 @@ private SearchRequestContextImpl(final ServerConnectionImpl clientConnection, this.entryHandler = entryHandler; } - /** {@inheritDoc} */ @Override public boolean handleEntry(final SearchResultEntry entry) { return entryHandler.handleEntry(entry); } - /** {@inheritDoc} */ @Override public boolean handleReference(final SearchResultReference reference) { return entryHandler.handleReference(reference); @@ -447,7 +410,6 @@ private ServerConnectionImpl(final RequestHandler requestHandler this.requestHandler = requestHandler; } - /** {@inheritDoc} */ @Override public void handleAbandon(final Integer messageID, final AbandonRequest request) { final RequestContextImpl abandonedRequest = @@ -459,7 +421,6 @@ public void handleAbandon(final Integer messageID, final AbandonRequest request) } } - /** {@inheritDoc} */ @Override public void handleAdd(final Integer messageID, final AddRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -472,7 +433,6 @@ public void handleAdd(final Integer messageID, final AddRequest request, } } - /** {@inheritDoc} */ @Override public void handleBind(final Integer messageID, final int version, final BindRequest request, @@ -486,7 +446,6 @@ public void handleBind(final Integer messageID, final int version, } } - /** {@inheritDoc} */ @Override public void handleCompare(final Integer messageID, final CompareRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -499,28 +458,24 @@ public void handleCompare(final Integer messageID, final CompareRequest request, } } - /** {@inheritDoc} */ @Override public void handleConnectionClosed(final Integer messageID, final UnbindRequest request) { final LocalizableMessage cancelReason = INFO_CANCELED_BY_CLIENT_DISCONNECT.get(); doClose(cancelReason); } - /** {@inheritDoc} */ @Override public void handleConnectionDisconnected(final ResultCode resultCode, final String message) { final LocalizableMessage cancelReason = INFO_CANCELED_BY_SERVER_DISCONNECT.get(); doClose(cancelReason); } - /** {@inheritDoc} */ @Override public void handleConnectionError(final Throwable error) { final LocalizableMessage cancelReason = INFO_CANCELED_BY_CLIENT_ERROR.get(); doClose(cancelReason); } - /** {@inheritDoc} */ @Override public void handleDelete(final Integer messageID, final DeleteRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -533,7 +488,6 @@ public void handleDelete(final Integer messageID, final DeleteRequest request, } } - /** {@inheritDoc} */ @Override public void handleExtendedRequest(final Integer messageID, final ExtendedRequest request, @@ -569,10 +523,7 @@ public void handleExtendedRequest(final Integer messa INFO_CANCELED_BY_CANCEL_REQUEST.get(messageID); cancelledRequest.cancel(cancelReason, request, requestContext, true); } else { - /* - * Couldn't find the request. Invoke on context in order - * to remove pending request. - */ + /* Couldn't find the request. Invoke on context in order to remove pending request. */ requestContext.handleException(newLdapException(ResultCode.NO_SUCH_OPERATION)); } } @@ -589,7 +540,6 @@ public void handleExtendedRequest(final Integer messa } } - /** {@inheritDoc} */ @Override public void handleModify(final Integer messageID, final ModifyRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -602,7 +552,6 @@ public void handleModify(final Integer messageID, final ModifyRequest request, } } - /** {@inheritDoc} */ @Override public void handleModifyDN(final Integer messageID, final ModifyDNRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -615,7 +564,6 @@ public void handleModifyDN(final Integer messageID, final ModifyDNRequest reques } } - /** {@inheritDoc} */ @Override public void handleSearch(final Integer messageID, final SearchRequest request, final IntermediateResponseHandler intermediateResponseHandler, final SearchResultHandler entryHandler, @@ -698,7 +646,6 @@ private void doClose(final LocalizableMessage cancelReason) { private boolean removePendingRequest(final RequestContextImpl requestContext) { return pendingRequests.remove(requestContext.getMessageID()) != null; } - } /** @@ -728,10 +675,8 @@ static ServerConnection adaptRequestHandler( this.factory = factory; } - /** {@inheritDoc} */ @Override public ServerConnection handleAccept(final C clientContext) throws LdapException { return adaptRequestHandler(factory.handleAccept(clientContext)); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java index 0f304e2b7..f60c5eac0 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -38,7 +38,6 @@ * Lightweight Directory Access Protocol (LDAP): The Protocol */ public final class ResultCode { - /** * Contains equivalent values for the ResultCode values. * This allows easily using ResultCode values with switch statements. @@ -923,7 +922,6 @@ private ResultCode(final int intValue, final LocalizableMessage name, final bool this.resultCodeEnum = resultCodeEnum; } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -944,7 +942,6 @@ public LocalizableMessage getName() { return name; } - /** {@inheritDoc} */ @Override public int hashCode() { return intValue; @@ -1000,5 +997,4 @@ public boolean isExceptional() { public String toString() { return name.toString(); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java index a9af70961..d3727ca6f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2013 ForgeRock AS. + * Portions Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -32,7 +32,6 @@ * Scope for LDAP */ public final class SearchScope { - /** * Contains equivalent values for the SearchScope values. * This allows easily using SearchScope values with switch statements. @@ -57,21 +56,13 @@ public static enum Enum { private static final List IMMUTABLE_ELEMENTS = Collections.unmodifiableList(Arrays .asList(ELEMENTS)); - /** - * The scope is constrained to the search base entry. - */ + /** The scope is constrained to the search base entry. */ public static final SearchScope BASE_OBJECT = register(0, "base", Enum.BASE_OBJECT); - /** - * The scope is constrained to the immediate subordinates of the search base - * entry. - */ + /** The scope is constrained to the immediate subordinates of the search base entry. */ public static final SearchScope SINGLE_LEVEL = register(1, "one", Enum.SINGLE_LEVEL); - /** - * The scope is constrained to the search base entry and to all its - * subordinates. - */ + /** The scope is constrained to the search base entry and to all its subordinates. */ public static final SearchScope WHOLE_SUBTREE = register(2, "sub", Enum.WHOLE_SUBTREE); /** @@ -164,7 +155,6 @@ private SearchScope(final int intValue, final String name, Enum searchScopeEnum) this.searchScopeEnum = searchScopeEnum; } - /** {@inheritDoc} */ @Override public boolean equals(final Object obj) { if (this == obj) { @@ -176,7 +166,6 @@ public boolean equals(final Object obj) { } } - /** {@inheritDoc} */ @Override public int hashCode() { return intValue; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java index 4857c284b..c2c6ea366 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2013 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -125,31 +125,26 @@ public static ADNotificationRequestControl newControl(final boolean isCritical) return new ADNotificationRequestControl(isCritical); } - /** {@inheritDoc} */ @Override public String getOID() { return OID; } - /** {@inheritDoc} */ @Override public ByteString getValue() { return null; } - /** {@inheritDoc} */ @Override public boolean hasValue() { return false; } - /** {@inheritDoc} */ @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java index 631f2dab7..f9d45e4fb 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java @@ -82,17 +82,11 @@ * - Persistent Search: A Simple LDAP Change Notification Mechanism */ public final class EntryChangeNotificationResponseControl implements Control { - private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass(); - /** - * The OID for the entry change notification response control. - */ + /** The OID for the entry change notification response control. */ public static final String OID = "2.16.840.1.113730.3.4.7"; - /** - * A decoder which can be used for decoding the entry change notification - * response control. - */ + /** A decoder which can be used for decoding the entry change notification response control. */ public static final ControlDecoder DECODER = new ControlDecoder() { @@ -281,7 +275,6 @@ public PersistentSearchChangeType getChangeType() { return changeType; } - /** {@inheritDoc} */ @Override public String getOID() { return OID; @@ -298,7 +291,6 @@ public DN getPreviousName() { return previousName; } - /** {@inheritDoc} */ @Override public ByteString getValue() { final ByteStringBuilder buffer = new ByteStringBuilder(); @@ -322,19 +314,16 @@ public ByteString getValue() { } } - /** {@inheritDoc} */ @Override public boolean hasValue() { return true; } - /** {@inheritDoc} */ @Override public boolean isCritical() { return isCritical; } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -352,5 +341,4 @@ public String toString() { builder.append(")"); return builder.toString(); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java index e0d88a233..3a8b48bff 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -27,15 +28,10 @@ * */ public enum PasswordPolicyErrorType { - - /** - * Indicates that the password has expired and must be reset. - */ + /** Indicates that the password has expired and must be reset. */ PASSWORD_EXPIRED(0, "passwordExpired"), - /** - * Indicates that the user's account has been locked. - */ + /** Indicates that the user's account has been locked. */ ACCOUNT_LOCKED(1, "accountLocked"), /** @@ -44,37 +40,22 @@ public enum PasswordPolicyErrorType { */ CHANGE_AFTER_RESET(2, "changeAfterReset"), - /** - * Indicates that a user is restricted from changing her password. - */ + /** Indicates that a user is restricted from changing her password. */ PASSWORD_MOD_NOT_ALLOWED(3, "passwordModNotAllowed"), - /** - * Indicates that the old password must be supplied in order to modify the - * password. - */ + /** Indicates that the old password must be supplied in order to modify the password. */ MUST_SUPPLY_OLD_PASSWORD(4, "mustSupplyOldPassword"), - /** - * Indicates that a password doesn't pass quality checking. - */ + /** Indicates that a password doesn't pass quality checking. */ INSUFFICIENT_PASSWORD_QUALITY(5, "insufficientPasswordQuality"), - /** - * Indicates that a password is not long enough. - */ + /** Indicates that a password is not long enough. */ PASSWORD_TOO_SHORT(6, "passwordTooShort"), - /** - * Indicates that the age of the password to be modified is not yet old - * enough. - */ + /** Indicates that the age of the password to be modified is not yet old enough. */ PASSWORD_TOO_YOUNG(7, "passwordTooYoung"), - /** - * Indicates that a password has already been used and the user must choose - * a different one. - */ + /** Indicates that a password has already been used and the user must choose a different one. */ PASSWORD_IN_HISTORY(8, "passwordInHistory"); private final int intValue; @@ -86,7 +67,6 @@ private PasswordPolicyErrorType(final int intValue, final String name) { this.name = name; } - /** {@inheritDoc} */ @Override public String toString() { return name; @@ -100,5 +80,4 @@ public String toString() { int intValue() { return intValue; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java index cbba897af..4f9d0303c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -30,9 +31,7 @@ * */ public enum PasswordPolicyWarningType { - /** - * Indicates the number of seconds before a password will expire. - */ + /** Indicates the number of seconds before a password will expire. */ TIME_BEFORE_EXPIRATION(0, "timeBeforeExpiration"), /** @@ -50,7 +49,6 @@ private PasswordPolicyWarningType(final int intValue, final String name) { this.name = name; } - /** {@inheritDoc} */ @Override public String toString() { return name; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java index f0642a74e..8e75f7c10 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2013-2015 ForgeRock AS. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.controls; @@ -28,27 +28,13 @@ * - Persistent Search: A Simple LDAP Change Notification Mechanism */ public enum PersistentSearchChangeType { - /** - * Indicates that an Add operation triggered the entry change notification. - */ + /** Indicates that an Add operation triggered the entry change notification. */ ADD(1, "add"), - - /** - * Indicates that an Delete operation triggered the entry change - * notification. - */ + /** Indicates that an Delete operation triggered the entry change notification. */ DELETE(2, "delete"), - - /** - * Indicates that an Modify operation triggered the entry change - * notification. - */ + /** Indicates that an Modify operation triggered the entry change notification. */ MODIFY(4, "modify"), - - /** - * Indicates that an Modify DN operation triggered the entry change - * notification. - */ + /** Indicates that an Modify DN operation triggered the entry change notification. */ MODIFY_DN(8, "modifyDN"); private final String name; @@ -59,7 +45,6 @@ private PersistentSearchChangeType(final int intValue, final String name) { this.intValue = intValue; } - /** {@inheritDoc} */ @Override public String toString() { return name; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java index ad3799652..66d90a039 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -29,7 +29,6 @@ * values in byte order. */ abstract class AbstractApproximateMatchingRuleImpl extends AbstractMatchingRuleImpl { - private final Indexer indexer; AbstractApproximateMatchingRuleImpl(String indexID) { @@ -42,7 +41,6 @@ public final Assertion getAssertion(final Schema schema, final ByteSequence asse return named(indexer.getIndexID(), normalizeAttributeValue(schema, assertionValue)); } - /** {@inheritDoc} */ @Override public final Collection createIndexers(IndexingOptions options) { return Collections.singleton(indexer); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java index 994232a16..2fe8af9d6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -42,7 +42,6 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV return defaultAssertion(normalizeAttributeValue(schema, assertionValue)); } - /** {@inheritDoc} */ @Override public Collection createIndexers(IndexingOptions options) { return Collections.singleton(indexer); @@ -51,5 +50,4 @@ public Collection createIndexers(IndexingOptions options) { Assertion defaultAssertion(final ByteSequence normalizedAssertionValue) { return named(indexer.getIndexID(), normalizedAssertionValue); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java index db3157842..96db48dc3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,7 +44,6 @@ abstract class AbstractOrderingMatchingRuleImpl extends AbstractMatchingRuleImpl this.indexer = new DefaultIndexer(indexId); } - /** {@inheritDoc} */ @Override public final Assertion getAssertion(final Schema schema, final ByteSequence value) throws DecodeException { @@ -63,7 +62,6 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti }; } - /** {@inheritDoc} */ @Override public final Assertion getGreaterOrEqualAssertion(final Schema schema, final ByteSequence value) throws DecodeException { @@ -82,7 +80,6 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti }; } - /** {@inheritDoc} */ @Override public final Assertion getLessOrEqualAssertion(final Schema schema, final ByteSequence value) throws DecodeException { @@ -101,10 +98,8 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti }; } - /** {@inheritDoc} */ @Override public final Collection createIndexers(IndexingOptions options) { return Collections.singleton(indexer); } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java index d86ecdb6a..abb5aaf63 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java @@ -13,8 +13,8 @@ * * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2014 Manuel Gaupp + * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import java.io.IOException; @@ -38,44 +38,36 @@ import org.forgerock.opendj.ldap.ByteSequence; import org.forgerock.opendj.ldap.DecodeException; - - /** * This class implements the certificate attribute syntax. It is restricted to * accept only X.509 certificates. */ final class CertificateSyntaxImpl extends AbstractSyntaxImpl { - /** {@inheritDoc} */ @Override public String getEqualityMatchingRule() { return EMR_CERTIFICATE_EXACT_OID; } - /** {@inheritDoc} */ @Override public String getName() { return SYNTAX_CERTIFICATE_NAME; } - /** {@inheritDoc} */ @Override public String getOrderingMatchingRule() { return OMR_OCTET_STRING_OID; } - /** {@inheritDoc} */ @Override public boolean isBEREncodingRequired() { return true; } - /** {@inheritDoc} */ @Override public boolean isHumanReadable() { return false; } - /** {@inheritDoc} */ @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java index 07375ebe7..83daaf5c6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -44,7 +44,6 @@ * ordering rules) and a substring one (for substring rule). */ final class CollationMatchingRulesImpl { - private static final String INDEX_ID_SHARED = "shared"; private static final String INDEX_ID_SUBSTRING = "substring"; @@ -118,9 +117,7 @@ static MatchingRuleImpl collationGreaterThanOrEqualToMatchingRule(Locale locale) return new CollationGreaterThanOrEqualToMatchingRuleImpl(locale); } - /** - * Defines the base for collation matching rules. - */ + /** Defines the base for collation matching rules. */ private static abstract class AbstractCollationMatchingRuleImpl extends AbstractMatchingRuleImpl { private final Locale locale; final Collator collator; @@ -172,13 +169,11 @@ String getPrefixIndexName() { return builder.toString(); } - /** {@inheritDoc} */ @Override public Collection createIndexers(IndexingOptions options) { return Collections.singletonList(indexer); } - /** {@inheritDoc} */ @Override public ByteString normalizeAttributeValue(final Schema schema, final ByteSequence value) throws DecodeException { @@ -192,11 +187,8 @@ public ByteString normalizeAttributeValue(final Schema schema, final ByteSequenc } } - /** - * Defines the collation equality matching rule. - */ + /** Defines the collation equality matching rule. */ private static final class CollationEqualityMatchingRuleImpl extends AbstractCollationMatchingRuleImpl { - /** * Creates the matching rule with the provided locale. * @@ -212,14 +204,10 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV throws DecodeException { return named(indexName, normalizeAttributeValue(schema, assertionValue)); } - } - /** - * Defines the collation substring matching rule. - */ + /** Defines the collation substring matching rule. */ private static final class CollationSubstringMatchingRuleImpl extends AbstractCollationMatchingRuleImpl { - private final AbstractSubstringMatchingRuleImpl substringMatchingRule; /** @@ -245,14 +233,12 @@ public Assertion getAssertion(final Schema schema, final ByteSequence assertionV return substringMatchingRule.getAssertion(schema, assertionValue); } - /** {@inheritDoc} */ @Override public Assertion getSubstringAssertion(Schema schema, ByteSequence subInitial, List subAnyElements, ByteSequence subFinal) throws DecodeException { return substringMatchingRule.getSubstringAssertion(schema, subInitial, subAnyElements, subFinal); } - /** {@inheritDoc} */ @Override public final Collection createIndexers(IndexingOptions options) { final Collection indexers = new ArrayList<>(substringMatchingRule.createIndexers(options)); @@ -261,11 +247,8 @@ public final Collection createIndexers(IndexingOptions option } } - /** - * Defines the collation ordering matching rule. - */ + /** Defines the collation ordering matching rule. */ private static abstract class CollationOrderingMatchingRuleImpl extends AbstractCollationMatchingRuleImpl { - final AbstractOrderingMatchingRuleImpl orderingMatchingRule; /** @@ -286,48 +269,36 @@ public ByteString normalizeAttributeValue(Schema schema, ByteSequence value) thr } } - /** - * Defines the collation less than matching rule. - */ + /** Defines the collation less than matching rule. */ private static final class CollationLessThanMatchingRuleImpl extends CollationOrderingMatchingRuleImpl { - CollationLessThanMatchingRuleImpl(Locale locale) { super(locale); } - /** {@inheritDoc} */ @Override public Assertion getAssertion(Schema schema, ByteSequence assertionValue) throws DecodeException { return orderingMatchingRule.getAssertion(schema, assertionValue); } } - /** - * Defines the collation less than or equal matching rule. - */ + /** Defines the collation less than or equal matching rule. */ private static final class CollationLessThanOrEqualToMatchingRuleImpl extends CollationOrderingMatchingRuleImpl { - CollationLessThanOrEqualToMatchingRuleImpl(Locale locale) { super(locale); } - /** {@inheritDoc} */ @Override public Assertion getAssertion(Schema schema, ByteSequence assertionValue) throws DecodeException { return orderingMatchingRule.getLessOrEqualAssertion(schema, assertionValue); } } - /** - * Defines the collation greater than matching rule. - */ + /** Defines the collation greater than matching rule. */ private static final class CollationGreaterThanMatchingRuleImpl extends CollationOrderingMatchingRuleImpl { - CollationGreaterThanMatchingRuleImpl(Locale locale) { super(locale); } - /** {@inheritDoc} */ @Override public Assertion getAssertion(Schema schema, ByteSequence assertionValue) throws DecodeException { @@ -347,17 +318,13 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti } } - /** - * Defines the collation greater than or equal matching rule. - */ + /** Defines the collation greater than or equal matching rule. */ private static final class CollationGreaterThanOrEqualToMatchingRuleImpl extends CollationOrderingMatchingRuleImpl { - CollationGreaterThanOrEqualToMatchingRuleImpl(Locale locale) { super(locale); } - /** {@inheritDoc} */ @Override public Assertion getAssertion(Schema schema, ByteSequence assertionValue) throws DecodeException { return orderingMatchingRule.getGreaterOrEqualAssertion(schema, assertionValue); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java index 551120849..9043a96dc 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java @@ -118,7 +118,6 @@ public T createIndexQuery(IndexQueryFactory factory) throws DecodeExcepti }; } - /** {@inheritDoc} */ @Override public Collection createIndexers(IndexingOptions options) { return Collections.emptySet(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java index eecfab571..c1f2eb73f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import static org.forgerock.opendj.ldap.schema.SchemaUtils.unmodifiableCopyOfExtraProperties; @@ -187,9 +186,7 @@ T removeExtraProperty0(final String extensionName, final String... extensionValu } } - /** - * Lazily created string representation. - */ + /** Lazily created string representation. */ private String definition; /** The description for this definition. */ @@ -218,7 +215,6 @@ T removeExtraProperty0(final String extensionName, final String... extensionValu this.definition = definition; } - /** {@inheritDoc} */ @Override public abstract boolean equals(Object obj); @@ -244,7 +240,6 @@ public final Map> getExtraProperties() { return extraProperties; } - /** {@inheritDoc} */ @Override public abstract int hashCode(); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java index 8fcef23f9..d8a9c8130 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.spi; import org.forgerock.opendj.ldap.IntermediateResponseHandler; @@ -30,9 +29,7 @@ import org.forgerock.opendj.ldap.responses.SearchResultReference; import org.forgerock.util.promise.PromiseImpl; -/** - * Search result promise implementation. - */ +/** Search result promise implementation. */ public final class SearchResultLdapPromiseImpl extends ResultLdapPromiseImpl implements SearchResultHandler { private SearchResultHandler searchResultHandler; @@ -50,7 +47,6 @@ public final class SearchResultLdapPromiseImpl extends ResultLdapPromiseImpl { private final BlockingQueue responses; private volatile boolean isInterrupted; @@ -204,17 +199,13 @@ public ConnectionEntryReader(final Connection connection, final SearchRequest se promise = connection.searchAsync(searchRequest, buffer).thenOnResult(buffer).thenOnException(buffer); } - /** - * Closes this connection entry reader, canceling the search request if it - * is still active. - */ + /** Closes this connection entry reader, canceling the search request if it is still active. */ @Override public void close() { // Cancel the search if it is still running. promise.cancel(true); } - /** {@inheritDoc} */ @Override public boolean hasNext() throws LdapException { // Poll for the next response if needed. diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java index 9c32e1f2b..0ba1cb1f6 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -185,7 +185,6 @@ public LDIFChangeRecordReader(final String... ldifLines) { super(Arrays.asList(ldifLines)); } - /** {@inheritDoc} */ @Override public void close() throws IOException { close0(); @@ -373,10 +372,7 @@ private ChangeRecord getNextChangeRecord() throws DecodeException, IOException { } try { - /* - * Read the DN of the entry and see if it is one that should be - * included in the import. - */ + /* Read the DN of the entry and see if it is one that should be included in the import. */ final DN entryDN = readLDIFRecordDN(record); if (entryDN == null) { // Skip version record. @@ -559,10 +555,7 @@ private ChangeRecord parseModifyChangeRecordEntry(final DN entryDN, final LDIFRe schemaErrors.add(message); continue; default: // Ignore - /* - * This should not happen: we should be using a non-strict - * schema for this policy. - */ + /* This should not happen: we should be using a non-strict schema for this policy. */ throw new IllegalStateException("Schema is not consistent with policy", e); } } catch (final LocalizedIllegalArgumentException e) { @@ -597,10 +590,7 @@ private ChangeRecord parseModifyChangeRecordEntry(final DN entryDN, final LDIFRe attributeDescription = attributeDescription.withOption("binary"); } - /* - * Now go through the rest of the attributes until the "-" line is - * reached. - */ + /* Now go through the rest of the attributes until the "-" line is reached. */ attributeValues.clear(); while (record.iterator.hasNext()) { ldifLine = record.iterator.next(); @@ -747,5 +737,4 @@ private ChangeRecord parseModifyDNChangeRecordEntry(final DN entryDN, final LDIF return modifyDNRequest; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java index a3afde1aa..33d04319e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldif; import java.io.IOException; @@ -62,7 +61,6 @@ * Interchange Format (LDIF) - Technical Specification */ public final class LDIFChangeRecordWriter extends AbstractLDIFWriter implements ChangeRecordWriter { - /** * Returns the LDIF string representation of the provided change record. * @@ -114,13 +112,11 @@ public LDIFChangeRecordWriter(final Writer writer) { super(writer); } - /** {@inheritDoc} */ @Override public void close() throws IOException { close0(); } - /** {@inheritDoc} */ @Override public void flush() throws IOException { flush0(); @@ -246,7 +242,6 @@ public LDIFChangeRecordWriter setWrapColumn(final int wrapColumn) { return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeChangeRecord(final AddRequest change) throws IOException { Reject.ifNull(change); @@ -277,7 +272,6 @@ public LDIFChangeRecordWriter writeChangeRecord(final AddRequest change) throws return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeChangeRecord(final ChangeRecord change) throws IOException { Reject.ifNull(change); @@ -294,7 +288,6 @@ public LDIFChangeRecordWriter writeChangeRecord(final ChangeRecord change) throw return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeChangeRecord(final DeleteRequest change) throws IOException { Reject.ifNull(change); @@ -314,7 +307,6 @@ public LDIFChangeRecordWriter writeChangeRecord(final DeleteRequest change) thro return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeChangeRecord(final ModifyDNRequest change) throws IOException { @@ -351,7 +343,6 @@ public LDIFChangeRecordWriter writeChangeRecord(final ModifyDNRequest change) return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeChangeRecord(final ModifyRequest change) throws IOException { Reject.ifNull(change); @@ -393,11 +384,9 @@ public LDIFChangeRecordWriter writeChangeRecord(final ModifyRequest change) thro return this; } - /** {@inheritDoc} */ @Override public LDIFChangeRecordWriter writeComment(final CharSequence comment) throws IOException { writeComment0(comment); return this; } - } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java index 2c414bcda..5834c27bf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -146,7 +146,6 @@ public LDIFEntryReader(final String... ldifLines) { super(Arrays.asList(ldifLines)); } - /** {@inheritDoc} */ @Override public void close() throws IOException { close0(); @@ -360,10 +359,7 @@ private Entry getNextEntry() throws DecodeException, IOException { } try { - /* - * Read the DN of the entry and see if it is one that should be - * included in the import. - */ + /* Read the DN of the entry and see if it is one that should be included in the import. */ final DN entryDN = readLDIFRecordDN(record); if (entryDN == null) { // Skip version record. @@ -421,5 +417,4 @@ private Entry getNextEntry() throws DecodeException, IOException { return nextEntry; } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java index 6ee3a2b82..f62706a55 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import java.util.LinkedList; @@ -56,7 +55,6 @@ */ @SuppressWarnings("javadoc") public class AbstractAsynchronousConnectionTestCase extends SdkTestCase { - public final class MockConnection extends AbstractAsynchronousConnection { private final ResultCode resultCode; private final SearchResultEntry[] entries; @@ -66,7 +64,6 @@ public MockConnection(ResultCode resultCode, SearchResultEntry...entries) { this.entries = entries; } - /** {@inheritDoc} */ @Override public LdapPromise abandonAsync(AbandonRequest request) { if (!resultCode.isExceptional()) { @@ -76,86 +73,73 @@ public LdapPromise abandonAsync(AbandonRequest request) { } } - /** {@inheritDoc} */ @Override public LdapPromise addAsync(AddRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newResult(resultCode)); } - /** {@inheritDoc} */ @Override public void addConnectionEventListener(ConnectionEventListener listener) { // Do nothing. } - /** {@inheritDoc} */ @Override public LdapPromise bindAsync(BindRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newBindResult(resultCode)); } - /** {@inheritDoc} */ @Override public void close(UnbindRequest request, String reason) { // Do nothing. } - /** {@inheritDoc} */ @Override public LdapPromise compareAsync(CompareRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newCompareResult(resultCode)); } - /** {@inheritDoc} */ @Override public LdapPromise deleteAsync(DeleteRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newResult(resultCode)); } - /** {@inheritDoc} */ @Override public LdapPromise extendedRequestAsync(ExtendedRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(request.getResultDecoder().newExtendedErrorResult(resultCode, "", "")); } - /** {@inheritDoc} */ @Override public boolean isClosed() { return false; } - /** {@inheritDoc} */ @Override public boolean isValid() { return true; } - /** {@inheritDoc} */ @Override public LdapPromise modifyAsync(ModifyRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newResult(resultCode)); } - /** {@inheritDoc} */ @Override public LdapPromise modifyDNAsync(ModifyDNRequest request, IntermediateResponseHandler intermediateResponseHandler) { return getPromiseFromResultCode(newResult(resultCode)); } - /** {@inheritDoc} */ @Override public void removeConnectionEventListener(ConnectionEventListener listener) { // Do nothing. } - /** {@inheritDoc} */ @Override public LdapPromise searchAsync(SearchRequest request, IntermediateResponseHandler intermediateResponseHandler, SearchResultHandler entryHandler) { @@ -174,12 +158,10 @@ private LdapPromise getPromiseFromResultCode(T correctResu } } - /** {@inheritDoc} */ @Override public String toString() { return "MockConnection"; } - } @Test @@ -477,5 +459,4 @@ public void testSingleEntrySearchAsyncRequestFail() throws Exception { verify(exceptionHandler).handleException(any(LdapException.class)); } } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java index 223f49ab8..aca05b04f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2012-2014 ForgeRock AS. + * Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -23,10 +23,7 @@ import org.forgerock.opendj.ldap.responses.ExtendedResult; -/** - * A connection event listener which records events and signals when it has been - * notified. - */ +/** A connection event listener which records events and signals when it has been notified. */ @SuppressWarnings("javadoc") public final class MockConnectionEventListener implements ConnectionEventListener { private final CountDownLatch closedLatch = new CountDownLatch(1); @@ -37,14 +34,12 @@ public final class MockConnectionEventListener implements ConnectionEventListene private ExtendedResult notification; private final AtomicInteger invocationCount = new AtomicInteger(); - /** {@inheritDoc} */ @Override public void handleConnectionClosed() { invocationCount.incrementAndGet(); closedLatch.countDown(); } - /** {@inheritDoc} */ @Override public void handleConnectionError(boolean isDisconnectNotification, LdapException error) { this.isDisconnectNotification = isDisconnectNotification; @@ -53,7 +48,6 @@ public void handleConnectionError(boolean isDisconnectNotification, LdapExceptio errorLatch.countDown(); } - /** {@inheritDoc} */ @Override public void handleUnsolicitedNotification(ExtendedResult notification) { this.notification = notification; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java index 9d3c9a675..faab9af3f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java @@ -38,30 +38,23 @@ import static org.mockito.Mockito.*; import static org.testng.Assert.*; -/** - * Tests all generic code of AbstractSubstringMatchingRuleImpl. - */ +/** Tests all generic code of AbstractSubstringMatchingRuleImpl. */ @SuppressWarnings("javadoc") public class AbstractSubstringMatchingRuleImplTest extends AbstractSchemaTestCase { - private int subStringLength = 3; private static class FakeSubstringMatchingRuleImpl extends AbstractSubstringMatchingRuleImpl { - FakeSubstringMatchingRuleImpl() { super(SMR_CASE_EXACT_OID, EMR_CASE_EXACT_OID); } - /** {@inheritDoc} */ @Override public ByteString normalizeAttributeValue(Schema schema, ByteSequence value) throws DecodeException { return value.toByteString(); } - } static class FakeIndexQueryFactory implements IndexQueryFactory { - private final IndexingOptions options; private final boolean normalizedValuesAreReadable; @@ -129,7 +122,6 @@ public String createUnionQuery(Collection subqueries) { public IndexingOptions getIndexingOptions() { return options; } - } private MatchingRuleImpl getRule() { @@ -160,7 +152,7 @@ public Object[][] invalidAssertions() { }; } - @Test(dataProvider = "invalidAssertions", expectedExceptions = { DecodeException.class }) + @Test(dataProvider = "invalidAssertions", expectedExceptions = DecodeException.class) public void testInvalidAssertion(String assertionValue) throws Exception { getRule().getAssertion(null, valueOfUtf8(assertionValue)); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java index 6368d7bf6..5f79e1581 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Attribute type syntax tests. - */ +/** Attribute type syntax tests. */ @Test public class AttributeTypeSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -110,10 +107,8 @@ public Object[][] createAcceptableValues() { + " NO-USER-MODIFICATION USAGE userApplications", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_ATTRIBUTE_TYPE_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java index 29efa5a39..5157b8dda 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,11 +21,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the BitStringEqualityMatchingRule. - */ +/** Test the BitStringEqualityMatchingRule. */ public class BitStringEqualityMatchingRuleTest extends MatchingRuleTest { - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -36,7 +34,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { { "\'1010\'A" }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -46,7 +43,6 @@ public Object[][] createMatchingRuleTest() { { "\'0\'B", "\'1\'B", ConditionResult.FALSE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_BIT_STRING_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java index e996ec6ad..9d7a650c8 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -24,7 +24,6 @@ /** Bit string syntax tests. */ @Test public class BitStringSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -38,7 +37,6 @@ public Object[][] createAcceptableValues() { }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_BIT_STRING_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java index f64bcb482..2614b368d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,19 +21,14 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the BooleanEqualityMatchingRule. - */ +/** Test the BooleanEqualityMatchingRule. */ public class BooleanEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { { "garbage" }, }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -48,10 +44,8 @@ public Object[][] createMatchingRuleTest() { { "TRUE", "false", ConditionResult.FALSE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_BOOLEAN_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java index 92e34b717..fb4e0c7f6 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,19 +21,14 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseExactEqualityMatchingRule. - */ +/** Test the CaseExactEqualityMatchingRule. */ public class CaseExactEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -47,10 +43,8 @@ public Object[][] createMatchingRuleTest() { { "ABC45678", "abc45678", ConditionResult.FALSE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_CASE_EXACT_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java index ac0173f68..0c10fc180 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +21,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseExactIA5EqualityMatchingRule. - */ +/** Test the CaseExactIA5EqualityMatchingRule. */ public class CaseExactIA5EqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -34,7 +31,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -49,10 +45,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_CASE_EXACT_IA5_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java index 842703d40..0b6b7dc43 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -19,19 +20,14 @@ import org.testng.annotations.DataProvider; -/** - * Test the CaseExactOrderingMatchingRule. - */ +/** Test the CaseExactOrderingMatchingRule. */ public class CaseExactOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -41,7 +37,6 @@ public Object[][] createOrderingMatchingRuleTestData() { { "abcdef", "abcdef", 0 }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_CASE_EXACT_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java index 155be02c6..01d112b60 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,18 +21,14 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseIgnoreEqualityMatchingRule. - */ +/** Test the CaseIgnoreEqualityMatchingRule. */ public class CaseIgnoreEqualityMatchingRuleTest extends MatchingRuleTest { - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -52,12 +49,9 @@ public Object[][] createMatchingRuleTest() { { "foo\u0149bar", "foo\u02BC\u006Ebar", ConditionResult.TRUE }, { "foo\u017Bbar", "foo\u017Cbar", ConditionResult.TRUE }, { "foo\u017BBAR", "foo\u017Cbar", ConditionResult.TRUE }, - - }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_CASE_IGNORE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java index b3e863c2e..735859d2c 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +21,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the CaseExactIA5EqualityMatchingRule. - */ +/** Test the CaseExactIA5EqualityMatchingRule. */ public class CaseIgnoreIA5EqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -34,7 +31,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -44,10 +40,8 @@ public Object[][] createMatchingRuleTest() { { "ABC45678", "abc45678", ConditionResult.TRUE }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_CASE_IGNORE_IA5_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java index c674b1254..f104125ce 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -19,19 +20,14 @@ import org.testng.annotations.DataProvider; -/** - * Test the CaseIgnoreOrderingMatchingRule. - */ +/** Test the CaseIgnoreOrderingMatchingRule. */ public class CaseIgnoreOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -51,7 +47,6 @@ public Object[][] createOrderingMatchingRuleTestData() { { "a", "\u00f8", -1 }, }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_CASE_IGNORE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java index 46681b313..5fec536e2 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -29,15 +29,12 @@ @SuppressWarnings("javadoc") @Test public class CollationEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -72,7 +69,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.eq"); @@ -107,5 +103,4 @@ public void testCreateIndexQuery() throws Exception { ByteString normalizedValue = matchingRule.normalizeAttributeValue(value); assertEquals(indexQuery, "exactMatch(fr.shared, value=='" + normalizedValue.toHexString() + "')"); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java index 05c5881f9..0fec59629 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -28,15 +28,12 @@ @SuppressWarnings("javadoc") @Test public class CollationGreaterThanMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -71,7 +68,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.gt"); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java index 0df6838be..53b8d2d58 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -28,15 +28,12 @@ @SuppressWarnings("javadoc") @Test public class CollationGreaterThanOrEqualMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -71,11 +68,9 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.gte"); - } @Test diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java index 0dad0301e..3cc18f6e4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -28,15 +28,12 @@ @SuppressWarnings("javadoc") @Test public class CollationLessThanMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -71,7 +68,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.lt"); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java index 685c38974..ed8bcae3b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -28,15 +28,12 @@ @SuppressWarnings("javadoc") @Test public class CollationLessThanOrEqualMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -71,7 +68,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.lte"); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java index be997f90c..c140bc89e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java @@ -28,7 +28,6 @@ @SuppressWarnings("javadoc") @Test public class CollationSubstringMatchingRuleTest extends SubstringMatchingRuleTest { - @Override @DataProvider(name = "substringInvalidAssertionValues") public Object[][] createMatchingRuleInvalidAssertionValues() { @@ -41,7 +40,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringFinalMatchData") public Object[][] createSubstringFinalMatchData() { @@ -72,7 +70,6 @@ public Object[][] createSubstringFinalMatchData() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringInitialMatchData") public Object[][] createSubstringInitialMatchData() { @@ -99,7 +96,6 @@ public Object[][] createSubstringInitialMatchData() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "substringMiddleMatchData") public Object[][] createSubstringMiddleMatchData() { @@ -133,7 +129,6 @@ public Object[][] createSubstringMiddleMatchData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule("fr.sub"); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java index 05f170219..ddc814d90 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java @@ -13,7 +13,7 @@ * * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2012 Manuel Gaupp - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -22,9 +22,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Country String syntax tests. - */ +/** Country String syntax tests. */ @Test public class CountryStringSyntaxTest extends AbstractSyntaxTestCase { @Override @@ -42,7 +40,6 @@ public Object[][] createAcceptableValues() { }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_COUNTRY_STRING_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java index 13c5ce1dc..8c5de6489 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,9 +20,7 @@ import org.testng.annotations.DataProvider; -/** - * DIT content rule syntax tests. - */ +/** DIT content rule syntax tests. */ public class DITContentRuleSyntaxTest extends AbstractSyntaxTestCase { @Override @DataProvider(name = "acceptableValues") @@ -60,7 +58,6 @@ public Object[][] createAcceptableValues() { }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_DIT_CONTENT_RULE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java index bb50df8cd..dcf5cd8a9 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,20 +21,15 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the DirectoryStringFirstComponentEqualityMatchingRule. - */ +/** Test the DirectoryStringFirstComponentEqualityMatchingRule. */ @Test public class DirectoryStringFirstComponentEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { return new Object[][] {}; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -45,10 +40,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_DIRECTORY_STRING_FIRST_COMPONENT_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java index 652fb3e26..7ce2b00d4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -25,12 +25,9 @@ import static org.forgerock.opendj.ldap.schema.SchemaConstants.*; import static org.testng.Assert.*; -/** - * Enum syntax tests. - */ +/** Enum syntax tests. */ @SuppressWarnings("javadoc") public class EnumSyntaxTestCase extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -73,7 +70,6 @@ public void testDuplicateEnum() throws SchemaException, DecodeException { builder.toSchema(); } - /** {@inheritDoc} */ @Override protected Syntax getRule() throws SchemaException, DecodeException { final SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema()); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java index f82ad3d3d..2a95e90f3 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the GeneralizedTimeEqualityMatchingRule. - */ +/** Test the GeneralizedTimeEqualityMatchingRule. */ public class GeneralizedTimeEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -51,7 +47,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -74,10 +69,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_GENERALIZED_TIME_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java index 5d5ae407a..c90aea434 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.testng.annotations.DataProvider; -/** - * Test the GeneralizedTimeOrderingMatchingRule. - */ +/** Test the GeneralizedTimeOrderingMatchingRule. */ public class GeneralizedTimeOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { @@ -51,7 +47,6 @@ public Object[][] createOrderingMatchingRuleInvalidValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -70,7 +65,6 @@ public Object[][] createOrderingMatchingRuleTestData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_GENERALIZED_TIME_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java index 1a48d5720..b7ec520b5 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,9 +20,7 @@ import org.testng.annotations.DataProvider; -/** - * Generalized time syntax tests. - */ +/** Generalized time syntax tests. */ public class GeneralizedTimeSyntaxTest extends AbstractSyntaxTestCase { @Override @DataProvider(name = "acceptableValues") @@ -39,10 +37,8 @@ public Object[][] createAcceptableValues() { { "2006", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_GENERALIZED_TIME_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java index 76b1804d1..a6106a141 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,11 +20,8 @@ import org.testng.annotations.DataProvider; -/** - * Guide syntax tests. - */ +/** Guide syntax tests. */ public class GuideSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -36,7 +33,6 @@ public Object[][] createAcceptableValues() { { "sn$EQ|(cn$APPROX&?false)", true }, { "sn$EQ|(cn$APPROX&|?false)", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_GUIDE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java index 0f1b1d62e..bb0fe1cd6 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,21 +20,16 @@ import org.testng.annotations.DataProvider; -/** - * IA5 string syntax tests. - */ +/** IA5 string syntax tests. */ public class IA5StringSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { return new Object[][] { { "12345678", true }, { "12345678\u2163", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_IA5_STRING_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java index c601f648a..b0bfb70c0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the IntegerEqualityMatchingRule. - */ +/** Test the IntegerEqualityMatchingRule. */ public class IntegerEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -50,7 +46,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -66,10 +61,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_INTEGER_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java index 033980d2e..38116bd3e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -27,13 +27,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the IntegerOrderingMatchingRule. - */ +/** Test the IntegerOrderingMatchingRule. */ @SuppressWarnings("javadoc") public class IntegerOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { @@ -58,7 +54,6 @@ public Object[][] createOrderingMatchingRuleInvalidValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -86,7 +81,6 @@ public Object[][] createOrderingMatchingRuleTestData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_INTEGER_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java index 508d0cf00..92b70837d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Integer syntax tests. - */ +/** Integer syntax tests. */ @Test public class IntegerSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -43,10 +40,8 @@ public Object[][] createAcceptableValues() { }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_INTEGER_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java index b3af72721..099621850 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * LDAP syntax tests. - */ +/** LDAP syntax tests. */ @Test public class LDAPSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -73,7 +70,6 @@ public Object[][] createAcceptableValues() { }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_LDAP_SYNTAX_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java index aede007a8..952559590 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Matching rule syntax tests. - */ +/** Matching rule syntax tests. */ @Test public class MatchingRuleSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -43,10 +40,8 @@ public Object[][] createAcceptableValues() { + " X-name ( 'this is an extension' ) ", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_MATCHING_RULE_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java index 18be3e05d..c3f1c8f28 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Matching rule use syntax tests. - */ +/** Matching rule use syntax tests. */ @Test public class MatchingRuleUseSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -41,7 +38,6 @@ public Object[][] createAcceptableValues() { + " X-name ( 'this is an extension' ) ", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_MATCHING_RULE_USE_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java index 2dc741275..05fa3305a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,13 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the NumericStringEqualityMatchingRule. - */ +/** Test the NumericStringEqualityMatchingRule. */ @Test public class NumericStringEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -35,7 +31,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -50,10 +45,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_NUMERIC_STRING_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java index 0b1a9835a..8aa4b0591 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,13 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the NumericStringOrderingMatchingRule. - */ +/** Test the NumericStringOrderingMatchingRule. */ @Test public class NumericStringOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { @@ -34,7 +31,6 @@ public Object[][] createOrderingMatchingRuleInvalidValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -52,7 +48,6 @@ public Object[][] createOrderingMatchingRuleTestData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_NUMERIC_STRING_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java index 70a430bd5..31661ca9e 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,19 +21,15 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Other mailbox syntax tests. - */ +/** Other mailbox syntax tests. */ @Test public class OtherMailboxSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { return new Object[][] { { "MyMail$Mymailbox", true }, { "MyMailMymailbox", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_OTHER_MAILBOX_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java index 1ecea6b3f..41baa5090 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java @@ -34,8 +34,6 @@ @SuppressWarnings("javadoc") @Test public class PartialDateAndTimeMatchingRuleTestCase extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -98,7 +96,6 @@ public Object[][] createMatchingRuleInvalidAssertionValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -167,7 +164,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return CoreSchema.getInstance().getMatchingRule(SchemaConstants.MR_PARTIAL_DATE_AND_TIME_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java index e5f50c95f..1ea2f0678 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the PresentationAddressEqualityMatchingRule. - */ +/** Test the PresentationAddressEqualityMatchingRule. */ public class PresentationAddressEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -33,7 +29,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -45,10 +40,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_PRESENTATION_ADDRESS_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java index aff8addca..63ec174b3 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the ProtocolInformationEqualityMatchingRule. - */ +/** Test the ProtocolInformationEqualityMatchingRule. */ public class ProtocolInformationEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -33,7 +29,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -45,10 +40,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_PROTOCOL_INFORMATION_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java index f26172d68..b538354f4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -22,12 +22,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Regex syntax tests. - */ +/** Regex syntax tests. */ @SuppressWarnings("javadoc") public class RegexSyntaxTestCase extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -52,7 +49,6 @@ public void testInvalidPattern() { Assert.assertFalse(builder.toSchema().getWarnings().isEmpty()); } - /** {@inheritDoc} */ @Override protected Syntax getRule() { final SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema()); @@ -60,5 +56,4 @@ protected Syntax getRule() { .compile("^[a-z-A-Z]+:[0-9.]+\\d$"), false); return builder.toSchema().getSyntax("1.1.1"); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java index b586d52d4..2cf608273 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java @@ -34,8 +34,6 @@ @SuppressWarnings("javadoc") @Test public class RelativeTimeGreaterThanMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -68,7 +66,6 @@ public Object[][] createMatchingRuleInvalidAssertionValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -103,7 +100,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return CoreSchema.getInstance().getMatchingRule(SchemaConstants.OMR_RELATIVE_TIME_GREATER_THAN_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java index 8e86d10e9..aa354042a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java @@ -34,8 +34,6 @@ @SuppressWarnings("javadoc") @Test public class RelativeTimeLessThanMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -68,7 +66,6 @@ public Object[][] createMatchingRuleInvalidAssertionValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -104,7 +101,6 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return CoreSchema.getInstance().getMatchingRule(SchemaConstants.OMR_RELATIVE_TIME_LESS_THAN_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java index 28c2c854c..7a5bf7b9f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -22,12 +22,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Substitution syntax tests. - */ +/** Substitution syntax tests. */ @SuppressWarnings("javadoc") public class SubstitutionSyntaxTestCase extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -95,7 +92,6 @@ public void testUndefinedSubstitute2() { Assert.assertFalse(builder.toSchema().getWarnings().isEmpty()); } - /** {@inheritDoc} */ @Override protected Syntax getRule() { // Use IA5String syntax as our substitute. diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java index 2b2a9f5e4..0da8a74fd 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -22,13 +22,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Telephone number syntax tests. - */ +/** Telephone number syntax tests. */ @Test public class TelephoneNumberSyntaxTest extends AbstractSyntaxTestCase { - - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -43,12 +39,10 @@ public Object[][] createAcceptableValues() { { "", false } }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { SchemaBuilder builder = new SchemaBuilder(getCoreSchema()).setOption(ALLOW_NON_STANDARD_TELEPHONE_NUMBERS, false); return builder.toSchema().getSyntax(SYNTAX_TELEPHONE_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java index 7365d43c1..9bb0495b1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014-2015 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,13 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Telex syntax tests. - */ +/** Telex syntax tests. */ @Test public class TelexSyntaxTest extends AbstractSyntaxTestCase { - - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -37,10 +33,8 @@ public Object[][] createAcceptableValues() { { "12345$67890$()+,-./:? ", true }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_TELEX_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java index 6fd438df5..d2da45ca7 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2012-2014 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -27,9 +27,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * UTC time syntax tests. - */ +/** UTC time syntax tests. */ public class UTCTimeSyntaxTest extends AbstractSyntaxTestCase { @Override @DataProvider(name = "acceptableValues") @@ -167,7 +165,6 @@ public void testCreate00to49() throws Exception { } } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_UTC_TIME_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java index e749d86e8..d36d388d0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the UUIDEqualityMatchingRule. - */ +/** Test the UUIDEqualityMatchingRule. */ public class UUIDEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -37,7 +33,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -51,10 +46,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_UUID_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java index 79f777a60..3ccf5907d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java @@ -12,6 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. + * Portions Copyright 2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -19,12 +20,8 @@ import org.testng.annotations.DataProvider; -/** - * Test the UUIDOrderingMatchingRule. - */ +/** Test the UUIDOrderingMatchingRule. */ public class UUIDOrderingMatchingRuleTest extends OrderingMatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "OrderingMatchingRuleInvalidValues") public Object[][] createOrderingMatchingRuleInvalidValues() { @@ -36,7 +33,6 @@ public Object[][] createOrderingMatchingRuleInvalidValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "Orderingmatchingrules") public Object[][] createOrderingMatchingRuleTestData() { @@ -48,7 +44,6 @@ public Object[][] createOrderingMatchingRuleTestData() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(OMR_UUID_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java index a5fdfc4e5..8d2aa2713 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,12 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * UUID syntax tests. - */ +/** UUID syntax tests. */ @Test public class UUIDSyntaxTest extends AbstractSyntaxTestCase { - /** {@inheritDoc} */ @Override @DataProvider(name = "acceptableValues") public Object[][] createAcceptableValues() { @@ -44,7 +41,6 @@ public Object[][] createAcceptableValues() { { "12345678-9abc-def0-1234-1234567890a", false }, }; } - /** {@inheritDoc} */ @Override protected Syntax getRule() { return Schema.getCoreSchema().getSyntax(SYNTAX_UUID_OID); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java index 5f1ad8a20..6c26461db 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -21,13 +21,9 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test the UniqueMemberEqualityMatchingRule. - */ +/** Test the UniqueMemberEqualityMatchingRule. */ @Test public class UniqueMemberEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -36,7 +32,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -51,10 +46,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_UNIQUE_MEMBER_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java index dca925846..b0f9a0569 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -19,12 +19,8 @@ import org.testng.annotations.DataProvider; -/** - * Test the UserPasswordExactEqualityMatchingRule. - */ +/** Test the UserPasswordExactEqualityMatchingRule. */ public class UserPasswordExactEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -33,7 +29,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -42,10 +37,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_USER_PASSWORD_EXACT_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java index 981689d18..98540f5c0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -20,12 +20,8 @@ import org.forgerock.opendj.ldap.ConditionResult; import org.testng.annotations.DataProvider; -/** - * Test the WordEqualityMatchingRule. - */ +/** Test the WordEqualityMatchingRule. */ public class WordEqualityMatchingRuleTest extends MatchingRuleTest { - - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingRuleInvalidAttributeValues") public Object[][] createMatchingRuleInvalidAttributeValues() { @@ -34,7 +30,6 @@ public Object[][] createMatchingRuleInvalidAttributeValues() { }; } - /** {@inheritDoc} */ @Override @DataProvider(name = "matchingrules") public Object[][] createMatchingRuleTest() { @@ -55,10 +50,8 @@ public Object[][] createMatchingRuleTest() { }; } - /** {@inheritDoc} */ @Override protected MatchingRule getRule() { return Schema.getCoreSchema().getMatchingRule(EMR_WORD_OID); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java index f898bc6b3..1e5518dd7 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.spi; @@ -49,10 +49,8 @@ public LDAPListenerImpl getLDAPListener( return new BasicLDAPListener(address, factory, options); } - /** {@inheritDoc} */ @Override public String getName() { return "Basic"; } - } diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java index a37020761..c771d927f 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java @@ -47,27 +47,16 @@ import org.apache.maven.project.MavenProject; import org.forgerock.i18n.LocalizableMessage; -/** - * Generates an XML file of log messages found in properties files. - */ +/** Generates an XML file of log messages found in properties files. */ @Mojo(name = "generate-xml-messages-doc", defaultPhase = PRE_SITE) public class GenerateMessageFileMojo extends AbstractMojo { - - /** - * The Maven Project. - */ + /** The Maven Project. */ @Parameter(property = "project", readonly = true, required = true) private MavenProject project; - - /** - * The tag of the locale for which to generate the documentation. - */ + /** The tag of the locale for which to generate the documentation. */ @Parameter(defaultValue = "en") private String locale; - - /** - * The path to the directory containing the message properties files. - */ + /** The path to the directory containing the message properties files. */ @Parameter(required = true) private String messagesDirectory; @@ -78,16 +67,11 @@ public class GenerateMessageFileMojo extends AbstractMojo { @Parameter(required = true) private String outputDirectory; - /** - * A list which contains all file names, the extension is not needed. - */ + /** A list which contains all file names, the extension is not needed. */ @Parameter(required = true) private List messageFileNames; - - /** - * One-line descriptions for log reference categories. - */ - private static final HashMap CATEGORY_DESCRIPTIONS = new HashMap<>(); + /** One-line descriptions for log reference categories. */ + private static final Map CATEGORY_DESCRIPTIONS = new HashMap<>(); static { CATEGORY_DESCRIPTIONS.put("ACCESS_CONTROL", CATEGORY_ACCESS_CONTROL.get()); CATEGORY_DESCRIPTIONS.put("ADMIN", CATEGORY_ADMIN.get()); @@ -116,7 +100,6 @@ public class GenerateMessageFileMojo extends AbstractMojo { /** Message giving formatting rules for string keys. */ public static final String KEY_FORM_MSG = ".\n\nOpenDJ message property keys must be of the form\n\n" + "\t\'[CATEGORY]_[SEVERITY]_[DESCRIPTION]_[ORDINAL]\'\n\n"; - private static final String ERROR_SEVERITY_IDENTIFIER_STRING = "ERR_"; /** FreeMarker template configuration. */ @@ -151,17 +134,13 @@ private void writeLogRef(final File file, final String template, final Map { private Integer ordinal; private String xmlId; private String formatString; - /** - * Build log reference entry for an log message. - */ + /** Build log reference entry for an log message. */ public MessageRefEntry(final String msgPropKey, final Integer ordinal, final String formatString) { this.formatString = formatString; this.ordinal = ordinal; @@ -283,7 +262,6 @@ public Integer getOrdinal() { return this.ordinal; } - /** {@inheritDoc} */ @Override public String toString() { if (ordinal != null) { @@ -292,7 +270,6 @@ public String toString() { return description; } - /** {@inheritDoc} */ @Override public int compareTo(MessagePropertyKey k) { if (ordinal == k.ordinal) { diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java index 476347f26..faa4cbbbf 100644 --- a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java +++ b/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.grizzly; import java.io.IOException; @@ -84,17 +83,13 @@ */ final class LDAPServerFilter extends LDAPBaseFilter { - /** - * Provides an arbitrary write operation on a LDAP writer. - */ + /** Provides an arbitrary write operation on a LDAP writer. */ private interface LDAPWrite { void perform(LDAPWriter writer, int messageID, T message) throws IOException; } - /** - * Write operation for intermediate responses. - */ + /** Write operation for intermediate responses. */ private static final LDAPWrite INTERMEDIATE = new LDAPWrite() { @Override @@ -333,7 +328,6 @@ public void sendUnsolicitedNotification(final ExtendedResult notification) { } } - /** {@inheritDoc} */ @Override public String toString() { final StringBuilder builder = new StringBuilder(); @@ -463,7 +457,6 @@ public void handleException(final LdapException error) { protected void writeResult(LDAPWriter writer, CompareResult result) throws IOException { writer.writeCompareResult(messageID, result); - } } @@ -628,9 +621,7 @@ protected void writeResult(LDAPWriter writer, Result result) }; // @formatter:on - /** - * Default maximum request size for incoming requests. - */ + /** Default maximum request size for incoming requests. */ private static final int DEFAULT_MAX_REQUEST_SIZE = 5 * 1024 * 1024; private static final Attribute LDAP_CONNECTION_ATTR = @@ -662,7 +653,6 @@ protected void writeResult(LDAPWriter writer, Result result) private static final class ServerRequestHandler extends AbstractLDAPMessageHandler implements LDAPBaseHandler { - private final Connection connection; private final LDAPReader reader; diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java index b1005eb3c..cd22bc373 100644 --- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java +++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions Copyright 2011-2015 ForgeRock AS. + * Portions Copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.grizzly; @@ -72,9 +72,7 @@ import static org.forgerock.util.Options.defaultOptions; import static org.mockito.Mockito.*; -/** - * Tests the LDAPListener class. - */ +/** Tests the LDAPListener class. */ @SuppressWarnings("javadoc") public class GrizzlyLDAPListenerTestCase extends SdkTestCase { @@ -87,14 +85,12 @@ private static class MockServerConnection implements ServerConnection { // Do nothing. } - /** {@inheritDoc} */ @Override public void handleAbandon(final Integer requestContext, final AbandonRequest request) throws UnsupportedOperationException { // Do nothing. } - /** {@inheritDoc} */ @Override public void handleAdd(final Integer requestContext, final AddRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -102,7 +98,6 @@ public void handleAdd(final Integer requestContext, final AddRequest request, resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleBind(final Integer requestContext, final int version, final BindRequest request, @@ -111,7 +106,6 @@ public void handleBind(final Integer requestContext, final int version, resultHandler.handleResult(Responses.newBindResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleCompare(final Integer requestContext, final CompareRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -120,25 +114,21 @@ public void handleCompare(final Integer requestContext, final CompareRequest req resultHandler.handleResult(Responses.newCompareResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleConnectionClosed(final Integer requestContext, final UnbindRequest request) { isClosed.countDown(); } - /** {@inheritDoc} */ @Override public void handleConnectionDisconnected(final ResultCode resultCode, final String message) { // Do nothing. } - /** {@inheritDoc} */ @Override public void handleConnectionError(final Throwable error) { connectionError.handleResult(error); } - /** {@inheritDoc} */ @Override public void handleDelete(final Integer requestContext, final DeleteRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -146,7 +136,6 @@ public void handleDelete(final Integer requestContext, final DeleteRequest reque resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleExtendedRequest(final Integer requestContext, final ExtendedRequest request, @@ -157,7 +146,6 @@ public void handleExtendedRequest(final Integer reque "Extended operation " + request.getOID() + " not supported"))); } - /** {@inheritDoc} */ @Override public void handleModify(final Integer requestContext, final ModifyRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -165,7 +153,6 @@ public void handleModify(final Integer requestContext, final ModifyRequest reque resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleModifyDN(final Integer requestContext, final ModifyDNRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -173,26 +160,22 @@ public void handleModifyDN(final Integer requestContext, final ModifyDNRequest r resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS)); } - /** {@inheritDoc} */ @Override public void handleSearch(final Integer requestContext, final SearchRequest request, final IntermediateResponseHandler intermediateResponseHandler, final SearchResultHandler entryHandler, final LdapResultHandler resultHandler) throws UnsupportedOperationException { resultHandler.handleResult(Responses.newResult(ResultCode.SUCCESS)); } - } private static class MockServerConnectionFactory implements ServerConnectionFactory { - private final MockServerConnection serverConnection; private MockServerConnectionFactory(final MockServerConnection serverConnection) { this.serverConnection = serverConnection; } - /** {@inheritDoc} */ @Override public ServerConnection handleAccept(final LDAPClientContext clientContext) throws LdapException { serverConnection.context.handleResult(clientContext); @@ -200,25 +183,19 @@ public ServerConnection handleAccept(final LDAPClientContext clientCont } } - /** - * Disables logging before the tests. - */ + /** Disables logging before the tests. */ @BeforeClass public void disableLogging() { TestCaseUtils.setDefaultLogLevel(Level.SEVERE); } - /** - * Re-enable logging after the tests. - */ + /** Re-enable logging after the tests. */ @AfterClass public void enableLogging() { TestCaseUtils.setDefaultLogLevel(Level.INFO); } - /** - * Test creation of LDAP listener with default transport provider. - */ + /** Test creation of LDAP listener with default transport provider. */ @SuppressWarnings("unchecked") @Test public void testCreateLDAPListener() throws Exception { @@ -228,9 +205,7 @@ public void testCreateLDAPListener() throws Exception { listener.close(); } - /** - * Test creation of LDAP listener with default transport provider and custom class loader. - */ + /** Test creation of LDAP listener with default transport provider and custom class loader. */ @SuppressWarnings("unchecked") @Test public void testCreateLDAPListenerWithCustomClassLoader() throws Exception { @@ -242,11 +217,9 @@ public void testCreateLDAPListenerWithCustomClassLoader() throws Exception { listener.close(); } - /** - * Test creation of LDAP listener with unknown transport provider. - */ + /** Test creation of LDAP listener with unknown transport provider. */ @SuppressWarnings({ "unchecked" }) - @Test(expectedExceptions = { ProviderNotFoundException.class }, + @Test(expectedExceptions = ProviderNotFoundException.class, expectedExceptionsMessageRegExp = "^The requested provider 'unknown' .*") public void testCreateLDAPListenerFailureProviderNotFound() throws Exception { Options options = defaultOptions().set(TRANSPORT_PROVIDER, "unknown"); @@ -403,7 +376,6 @@ public void testLDAPListenerLoadBalanceDuringHandleBind() throws Exception { final MockServerConnection proxyServerConnection = new MockServerConnection() { - /** {@inheritDoc} */ @Override public void handleBind(final Integer requestContext, final int version, final BindRequest request, @@ -555,7 +527,6 @@ public void testLDAPListenerProxyDuringHandleBind() throws Exception { try { final MockServerConnection proxyServerConnection = new MockServerConnection() { - /** {@inheritDoc} */ @Override public void handleBind(final Integer requestContext, final int version, final BindRequest request, diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java index 3528f2690..7073c8e5b 100644 --- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java +++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/ProxyBackend.java @@ -89,7 +89,6 @@ final class ProxyBackend implements RequestHandler { this.bindFactory = bindFactory; } - /** {@inheritDoc} */ @Override public void handleAdd(final RequestContext requestContext, final AddRequest request, final IntermediateResponseHandler intermediateResponseHandler, final LdapResultHandler resultHandler) { @@ -105,7 +104,6 @@ public Promise apply(Connection connection) throws LdapEx }).thenOnResult(resultHandler).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - /** {@inheritDoc} */ @Override public void handleBind(final RequestContext requestContext, final int version, final BindRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -135,10 +133,8 @@ public final void handleResult(final BindResult result) { } }).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - } - /** {@inheritDoc} */ @Override public void handleCompare(final RequestContext requestContext, final CompareRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -155,7 +151,6 @@ public Promise apply(Connection connection) throws }).thenOnResult(resultHandler).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - /** {@inheritDoc} */ @Override public void handleDelete(final RequestContext requestContext, final DeleteRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -172,7 +167,6 @@ public Promise apply(Connection connection) throws LdapEx }).thenOnResult(resultHandler).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - /** {@inheritDoc} */ @Override public void handleExtendedRequest(final RequestContext requestContext, final ExtendedRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -201,7 +195,6 @@ public Promise apply(Connection connection) throws LdapExcepti } } - /** {@inheritDoc} */ @Override public void handleModify(final RequestContext requestContext, final ModifyRequest request, final IntermediateResponseHandler intermediateResponseHandler, @@ -218,7 +211,6 @@ public Promise apply(Connection connection) throws LdapEx }).thenOnResult(resultHandler).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - /** {@inheritDoc} */ @Override public void handleModifyDN(final RequestContext requestContext, final ModifyDNRequest request, final IntermediateResponseHandler intermediateResponseHandler, final LdapResultHandler resultHandler) { @@ -234,7 +226,6 @@ public Promise apply(Connection connection) throws LdapEx }).thenOnResult(resultHandler).thenOnException(resultHandler).thenAlways(close(connectionHolder)); } - /** {@inheritDoc} */ @Override public void handleSearch(final RequestContext requestContext, final SearchRequest request, final IntermediateResponseHandler intermediateResponseHandler, final SearchResultHandler entryHandler, diff --git a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java index 44cc8cfa8..9d52a64a7 100644 --- a/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java +++ b/opendj-ldap-sdk-examples/src/main/java/org/forgerock/opendj/examples/SearchAsync.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2015 ForgeRock AS. + * Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.examples; @@ -51,7 +51,6 @@ public final class SearchAsync { // --- JCite search result handler --- private static final class SearchResultHandlerImpl implements SearchResultHandler { - /** {@inheritDoc} */ @Override public synchronized boolean handleEntry(final SearchResultEntry entry) { try { @@ -91,7 +90,6 @@ public void handleException(LdapException exception) { return true; } - /** {@inheritDoc} */ @Override public synchronized boolean handleReference(final SearchResultReference reference) { try { diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java index dbceefdcc..d1071e382 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java @@ -206,7 +206,6 @@ void incrementIterationCount() { /** Thread local copies of the data sources. */ private final ThreadLocal dataSources = new ThreadLocal() { - /** {@inheritDoc} */ @Override protected DataSource[] initialValue() { final DataSource[] prototypes = getDataSources(); @@ -226,9 +225,9 @@ protected DataSource[] initialValue() { private int targetThroughput; private int maxIterations; - /** Warm-up duration time in ms. **/ + /** Warm-up duration time in ms. */ private long warmUpDurationMs; - /** Max duration time in ms, 0 for unlimited. **/ + /** Max duration time in ms, 0 for unlimited. */ private long maxDurationTimeMs; private boolean noRebind; private BindRequest bindRequest; diff --git a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java index 5adcc5ae8..486d6f6c4 100644 --- a/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java +++ b/opendj-rest2ldap/src/main/java/org/forgerock/opendj/rest2ldap/RequestState.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.rest2ldap; @@ -73,7 +73,7 @@ final class RequestState implements Closeable { private static final class CachedRead implements SearchResultHandler, LdapResultHandler { private SearchResultEntry cachedEntry; private final String cachedFilterString; - /** Guarded by cachedPromiseLatch.*/ + /** Guarded by cachedPromiseLatch. */ private LdapPromise cachedPromise; private final CountDownLatch cachedPromiseLatch = new CountDownLatch(1); private final SearchRequest cachedRequest; @@ -164,7 +164,6 @@ private void invokeResultHandler(final SearchResultHandler searchResultHandler) searchResultHandler.handleEntry(cachedEntry); } } - } /** @@ -191,10 +190,7 @@ protected boolean removeEldestEntry(final Map.Entry eldest) { this.config = config; this.context = context; - /* - * Re-use the pre-authenticated connection if available and the - * authorization policy allows. - */ + /* Re-use the pre-authenticated connection if available and the authorization policy allows. */ if (config.getAuthorizationPolicy() != AuthorizationPolicy.NONE && context.containsContext(AuthenticatedConnectionContext.class)) { this.connection = wrap(context.asContext(AuthenticatedConnectionContext.class).getConnection()); @@ -203,7 +199,6 @@ protected boolean removeEldestEntry(final Map.Entry eldest) { } } - /** {@inheritDoc} */ @Override public void close() { connection.close(); @@ -283,9 +278,7 @@ public final void handleException(final LdapException exception) { * if needed. */ private Connection wrap(final Connection connection) { - /* - * We only use async methods so no need to wrap sync methods. - */ + /* We only use async methods so no need to wrap sync methods. */ return new AbstractAsynchronousConnection() { @Override public LdapPromise abandonAsync(final AbandonRequest request) { @@ -439,5 +432,4 @@ private R withControls(final R request) { } }; } - } From 55338f2489c71eecdf62f2a30540861a78eda7ff Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Wed, 9 Mar 2016 18:40:33 +0100 Subject: [PATCH 077/125] OPENDJSDK-88 Move opendj-copyright-maven-plugin The plugin is moved to it's own repo, as a consequence all source and test files are removed from this repository. --- opendj-copyright-maven-plugin/pom.xml | 108 ----- .../forgerock/maven/CheckCopyrightMojo.java | 79 ---- .../maven/CopyrightAbstractMojo.java | 415 ----------------- .../forgerock/maven/UpdateCopyrightMojo.java | 432 ------------------ .../org/forgerock/maven/package-info.java | 19 - .../maven/UpdateCopyrightTestCase.java | 174 ------- .../forgerock-bad-copyright-1.java | 18 - .../forgerock-bad-copyright-2.c | 18 - .../forgerock-bad-copyright-3.java | 16 - .../forgerock-bad-copyright-4.h | 17 - .../forgerock-bad-copyright-5.txt | 18 - .../forgerock-bad-copyright-6.txt | 20 - .../forgerock-bad-copyright-7.html | 19 - .../forgerock-bad-copyright-8.xml | 18 - .../forgerock-bad-copyright-9.xsl | 16 - .../openidm-bad-copyright-1.java | 26 -- .../openidm-bad-copyright-2.java | 26 -- .../openidm-bad-copyright-3.java | 24 - .../openidm-bad-copyright-4.java | 25 - .../openidm-bad-copyright-5.java | 26 -- .../openidm-bad-copyright-6.java | 28 -- opendj-sdk-parent/pom.xml | 1 - 22 files changed, 1543 deletions(-) delete mode 100644 opendj-copyright-maven-plugin/pom.xml delete mode 100644 opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java delete mode 100644 opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java delete mode 100644 opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java delete mode 100644 opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java delete mode 100644 opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java delete mode 100644 opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java diff --git a/opendj-copyright-maven-plugin/pom.xml b/opendj-copyright-maven-plugin/pom.xml deleted file mode 100644 index 606c33a2a..000000000 --- a/opendj-copyright-maven-plugin/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - 4.0.0 - - - opendj-sdk-parent - org.forgerock.opendj - 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml - - - opendj-copyright-maven-plugin - OpenDJ Copyright Check Maven Plugin - Checks ForgeRock source file copyrights. - - maven-plugin - - - - 3.2.3 - 3.2 - - - - - - - org.apache.maven - maven-core - ${maven.version} - provided - - - - org.apache.maven - maven-model - ${maven.version} - provided - - - - org.apache.maven - maven-plugin-api - ${maven.version} - provided - - - - org.apache.maven.plugin-tools - maven-plugin-annotations - ${maven-plugin-plugin.version} - provided - - - - - org.forgerock - forgerock-build-tools - test - - - - - org.twdata.maven - mojo-executor - 2.2.0 - - - - - org.forgerock.commons - forgerock-util - - - - org.apache.maven.scm - maven-scm-api - 1.9.2 - - - - org.apache.maven.scm - maven-scm-provider-svn-commons - 1.9.2 - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.9.2 - - - diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java deleted file mode 100644 index 6276f5784..000000000 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CheckCopyrightMojo.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2015-2016 ForgeRock AS. - */ -package org.forgerock.maven; - -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.LifecyclePhase; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; - -/** - * This be used to check that if a modified file contains a line that appears to - * be a comment and includes the word "copyright", then it should contain the - * current year. - */ -@Mojo(name = "check-copyright", defaultPhase = LifecyclePhase.VALIDATE) -public class CheckCopyrightMojo extends CopyrightAbstractMojo { - private static final String IGNORE_COPYRIGHT_ERRORS_PROPERTY = "ignoreCopyrightErrors"; - - /** - * The property that may be used to prevent copyright date problems from - * failing the build. - */ - @Parameter(required = true, property = IGNORE_COPYRIGHT_ERRORS_PROPERTY, defaultValue = "false") - private boolean ignoreCopyrightErrors; - - @Parameter(required = true, property = "skipCopyrightCheck", defaultValue = "false") - private boolean checkDisabled; - - /** - * Uses maven-scm API to identify all modified files in the current - * workspace. For all source files, check if the copyright is up to date. - * - * @throws MojoFailureException - * if any - * @throws MojoExecutionException - * if any - */ - @Override - public void execute() throws MojoFailureException, MojoExecutionException { - if (checkDisabled) { - getLog().info("Copyright check is disabled"); - return; - } - - checkCopyrights(); - if (!getIncorrectCopyrightFilePaths().isEmpty()) { - getLog().warn("Potential copyright year updates needed for the following files:"); - for (String filename : getIncorrectCopyrightFilePaths()) { - getLog().warn(" " + filename); - } - - if (!ignoreCopyrightErrors) { - getLog().warn("Fix copyright date problems before proceeding, " - + "or use '-D" + IGNORE_COPYRIGHT_ERRORS_PROPERTY + "=true' to ignore copyright errors."); - getLog().warn("You can use update-copyrights maven profile " - + "(mvn validate -Pupdate-copyrights) to automatically update copyrights."); - getLog().warn("Use '-D" + DIFF_REFERENCE_BRANCH_NAME_PROPERTY + "=branchname' to change the reference " - + "branch which is used against your active local branch to check committed changes."); - throw new MojoExecutionException("Found files with potential copyright year updates needed"); - } - } else { - getLog().info("Copyrights are up to date"); - } - } -} diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java deleted file mode 100644 index f76d08554..000000000 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/CopyrightAbstractMojo.java +++ /dev/null @@ -1,415 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2015-2016 ForgeRock AS. - */ -package org.forgerock.maven; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.LinkedList; -import java.util.List; - -import org.apache.maven.plugin.AbstractMojo; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.Parameter; -import org.apache.maven.project.MavenProject; -import org.apache.maven.scm.ScmException; -import org.apache.maven.scm.ScmFile; -import org.apache.maven.scm.ScmFileSet; -import org.apache.maven.scm.ScmFileStatus; -import org.apache.maven.scm.ScmResult; -import org.apache.maven.scm.ScmVersion; -import org.apache.maven.scm.command.diff.DiffScmResult; -import org.apache.maven.scm.command.status.StatusScmResult; -import org.apache.maven.scm.log.ScmLogDispatcher; -import org.apache.maven.scm.log.ScmLogger; -import org.apache.maven.scm.manager.BasicScmManager; -import org.apache.maven.scm.manager.NoSuchScmProviderException; -import org.apache.maven.scm.manager.ScmManager; -import org.apache.maven.scm.provider.ScmProviderRepository; -import org.apache.maven.scm.provider.git.command.GitCommand; -import org.apache.maven.scm.provider.git.command.diff.GitDiffConsumer; -import org.apache.maven.scm.provider.git.gitexe.GitExeScmProvider; -import org.apache.maven.scm.provider.git.gitexe.command.GitCommandLineUtils; -import org.apache.maven.scm.provider.git.gitexe.command.diff.GitDiffCommand; -import org.apache.maven.scm.repository.ScmRepository; -import org.apache.maven.scm.repository.ScmRepositoryException; -import org.codehaus.plexus.util.cli.CommandLineUtils; -import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer; -import org.codehaus.plexus.util.cli.Commandline; - -/** - * Abstract class which is used for both copyright checks and updates. - */ -public abstract class CopyrightAbstractMojo extends AbstractMojo { - static final String DIFF_REFERENCE_BRANCH_NAME_PROPERTY = "checkCopyrightDiffReferenceBranchName"; - - /** The Maven Project. */ - @Parameter(required = true, property = "project", readonly = true) - private MavenProject project; - - /** - * Copyright owner. - * This string token must be present on the same line with 'copyright' keyword and the current year. - */ - @Parameter(required = true, defaultValue = "ForgeRock AS") - private String copyrightOwnerToken; - - /** The path to the root of the scm local workspace to check. */ - @Parameter(required = true, defaultValue = "${basedir}") - private String baseDir; - - @Parameter(required = true, defaultValue = "${project.scm.connection}") - private String scmRepositoryUrl; - - /** The Git master branch name of the repository. **/ - @Parameter(required = true, property = DIFF_REFERENCE_BRANCH_NAME_PROPERTY, defaultValue = "origin/master") - private String gitMasterBranchName; - - /** - * List of file patterns for which copyright check and/or update will be skipped. - * Pattern can contain the following wildcards (*, ?, **{@literal /}). - */ - @Parameter(required = false) - private List disabledFiles; - - /** The file extensions to test. */ - public static final List CHECKED_EXTENSIONS = Arrays.asList( - "bat", "c", "fml", "h", "html", "java", "java.stub", "ldif", "mc", - "md", "properties", "security", "sh", "txt", "xjb", "xml", "xml.vm", "xsd", "xsl"); - - private final class CustomGitExeScmProvider extends GitExeScmProvider { - @Override - protected GitCommand getDiffCommand() { - return new CustomGitDiffCommand(); - } - } - - private class CustomGitDiffCommand extends GitDiffCommand implements GitCommand { - @Override - protected DiffScmResult executeDiffCommand(ScmProviderRepository repo, ScmFileSet fileSet, - ScmVersion unused, ScmVersion unused2) throws ScmException { - final GitDiffConsumer consumer = new GitDiffConsumer(getLogger(), fileSet.getBasedir()); - final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(fileSet.getBasedir(), "diff"); - cl.addArguments(new String[] { "--no-ext-diff", "--relative", gitMasterBranchName + "...HEAD", "." }); - - if (GitCommandLineUtils.execute(cl, consumer, stderr, getLogger()) != 0) { - return new DiffScmResult(cl.toString(), "The git-diff command failed.", stderr.getOutput(), false); - } - return new DiffScmResult( - cl.toString(), consumer.getChangedFiles(), consumer.getDifferences(), consumer.getPatch()); - } - - } - - private static String resolveExtension(final String filePath) { - int firstPeriodPos = filePath.indexOf('.'); - if (firstPeriodPos > 0) { - return filePath.substring(firstPeriodPos + 1); - } - return ""; - } - - enum CommentParser { - BAT("rem"), - DEFAULT("#", "*", "!", "//"), - JAVA("/*", "*/", Arrays.asList("*", "//", "")), - MC(";"), - SH("#"), - XML("", Arrays.asList("!", "~", "")); - - static CommentParser createParserForFile(final String filePath) { - switch (resolveExtension(filePath)) { - case "java": - case "c": - case "h": - return JAVA; - case "fml": - case "html": - case "md": - case "xjb": - case "xml": - case "xml.vm": - case "xsd": - case "xsl": - return XML; - case "bat": - return BAT; - case "security": - case "sh": - case "ldif": - case "properties": - return SH; - case "mc": - return MC; - default: - return DEFAULT; - } - } - - private final String startBlock; - private final String endBlock; - private final List middleBlockTokens; - private String currentLine = ""; - private boolean supportCommentBlocks; - private boolean commentBlockOpened; - - CommentParser(final String... middleBlockTokens) { - this(null, null, Arrays.asList(middleBlockTokens)); - } - - CommentParser(final String startBlock, final String endBlock, final List middleBlockTokens) { - this.startBlock = startBlock; - this.endBlock = endBlock; - this.middleBlockTokens = middleBlockTokens; - this.supportCommentBlocks = startBlock != null && endBlock != null; - } - - void consumeLine(final String line) { - if (line != null) { - if (supportCommentBlocks && currentLine.endsWith(endBlock)) { - commentBlockOpened = false; - } - currentLine = line.trim(); - if (supportCommentBlocks && currentLine.startsWith(startBlock)) { - commentBlockOpened = true; - } - } - } - - boolean isCommentLine() { - return commentBlockOpened - || startsWithCommentLineToken(); - } - - private boolean startsWithCommentLineToken() { - return getCommentTokenInLine(currentLine) != null; - } - - private String getCommentTokenInLine(final String line) { - for (final String token : middleBlockTokens) { - if (line.startsWith(token)) { - return token; - } - } - return null; - } - - String getNewCommentedLine(final String line) throws Exception { - final String commentToken = getCommentTokenInLine(line.trim()); - if (commentToken == null) { - throw new Exception("Incompatibles comments lines in the file."); - } - - String resultLine = ""; - if (commentToken.isEmpty()) { - resultLine = " "; - } - return resultLine + line.substring(0, line.indexOf(commentToken) + commentToken.length()); - } - - boolean isNonEmptyCommentedLine() { - final String commentToken = getCommentTokenInLine(currentLine); - return commentToken == null || !commentToken.equals(currentLine); - } - } - - /** The string representation of the current year. */ - Integer currentYear = Calendar.getInstance().get(Calendar.YEAR); - - private final List incorrectCopyrightFilePaths = new LinkedList<>(); - - /** The overall SCM Client Manager. */ - private ScmManager scmManager; - - private ScmRepository scmRepository; - - List getIncorrectCopyrightFilePaths() { - return incorrectCopyrightFilePaths; - } - - private ScmManager getScmManager() throws MojoExecutionException { - if (scmManager == null) { - scmManager = new BasicScmManager(); - String scmProviderID = getScmProviderID(); - if (!"git".equals(scmProviderID)) { - throw new MojoExecutionException( - "Unsupported scm provider: " + scmProviderID + " or " + getIncorrectScmRepositoryUrlMsg()); - } - scmManager.setScmProvider(scmProviderID, new CustomGitExeScmProvider()); - } - - return scmManager; - } - - private String getScmProviderID() throws MojoExecutionException { - try { - return scmRepositoryUrl.split(":")[1]; - } catch (Exception e) { - throw new MojoExecutionException(getIncorrectScmRepositoryUrlMsg(), e); - } - } - - String getIncorrectScmRepositoryUrlMsg() { - return "the scmRepositoryUrl property with value '" + scmRepositoryUrl + "' is incorrect. " - + "The URL has to respect the format: scm:[provider]:[provider_specific_url]"; - } - - ScmRepository getScmRepository() throws MojoExecutionException { - if (scmRepository == null) { - try { - scmRepository = getScmManager().makeScmRepository(scmRepositoryUrl); - } catch (NoSuchScmProviderException e) { - throw new MojoExecutionException("Could not find a provider.", e); - } catch (ScmRepositoryException e) { - throw new MojoExecutionException("Error while connecting to the repository", e); - } - } - - return scmRepository; - } - - String getBaseDir() { - return baseDir; - } - - /** - * Performs a diff with current working directory state against remote HEAD revision. - * Then do a status to check uncommited changes as well. - */ - List getChangedFiles() throws MojoExecutionException, MojoFailureException { - try { - final ScmFileSet workspaceFileSet = new ScmFileSet(new File(getBaseDir())); - final DiffScmResult diffMasterHeadResult = getScmManager().diff( - getScmRepository(), workspaceFileSet, null, null); - ensureCommandSuccess(diffMasterHeadResult, "diff " + gitMasterBranchName + "...HEAD ."); - - final StatusScmResult statusResult = getScmManager().status(getScmRepository(), workspaceFileSet); - ensureCommandSuccess(statusResult, "status"); - - final List changedFilePaths = new ArrayList<>(); - addToChangedFiles(diffMasterHeadResult.getChangedFiles(), getBaseDir(), changedFilePaths); - final String localScmRootPath = getLocalScmRootPath(new File(getBaseDir())); - addToChangedFiles(statusResult.getChangedFiles(), localScmRootPath, changedFilePaths); - - return changedFilePaths; - } catch (ScmException e) { - throw new MojoExecutionException("Encountered an error while examining modified files, SCM status: " - + e.getMessage() + "No further checks will be performed.", e); - } - } - - private String getLocalScmRootPath(final File basedir) throws ScmException { - final Commandline cl = GitCommandLineUtils.getBaseGitCommandLine(basedir, "rev-parse"); - cl.addArguments(new String[] { "--show-toplevel" }); - - final StringStreamConsumer stdout = new CommandLineUtils.StringStreamConsumer(); - final StringStreamConsumer stderr = new CommandLineUtils.StringStreamConsumer(); - final ScmLogger dummyLogger = new ScmLogDispatcher(); - - final int exitCode = GitCommandLineUtils.execute(cl, stdout, stderr, dummyLogger); - return exitCode == 0 ? stdout.getOutput().trim().replace(" ", "%20") - : basedir.getPath(); - } - - private void ensureCommandSuccess(final ScmResult result, final String cmd) throws MojoFailureException { - if (!result.isSuccess()) { - final String message = "Impossible to perform scm " + cmd + " command because " + result.getCommandOutput(); - getLog().error(message); - throw new MojoFailureException(message); - } - } - - private void addToChangedFiles( - final List scmChangedFiles, final String rootPath, final List changedFiles) { - for (final ScmFile scmFile : scmChangedFiles) { - final String scmFilePath = scmFile.getPath(); - final File file = new File(rootPath, scmFilePath); - - if (scmFile.getStatus() != ScmFileStatus.UNKNOWN - && file.exists() - && !changedFiles.contains(file) - && !fileIsDisabled(scmFilePath)) { - changedFiles.add(file); - } - } - } - - private boolean fileIsDisabled(final String scmFilePath) { - if (disabledFiles == null) { - return false; - } - for (final String disableFile : disabledFiles) { - String regexp = disableFile.replace("**/", "(.+/)+").replace("?", ".?").replace("*", ".*?"); - if (scmFilePath.matches(regexp)) { - return true; - } - } - return false; - } - - /** Examines the provided files list to determine whether each changed file copyright is acceptable. */ - void checkCopyrights() throws MojoExecutionException, MojoFailureException { - for (final File changedFile : getChangedFiles()) { - if (!changedFile.exists() - || !changedFile.isFile() - || !CHECKED_EXTENSIONS.contains(resolveExtension(changedFile.getPath()).toLowerCase()) - || (fileNameEquals("bin", changedFile.getParentFile()) - && fileNameEquals("resource", changedFile.getParentFile().getParentFile()))) { - // Verify that the file must be checked (ignore bin/resource directory) - continue; - } - - if (!checkCopyrightForFile(changedFile)) { - incorrectCopyrightFilePaths.add(changedFile.getAbsolutePath()); - } - } - } - - private boolean fileNameEquals(String folderName, File file) { - return file != null && folderName.equals(file.getName()); - } - - /** - * Check to see whether the provided file has a comment line containing a - * copyright without the current year. - */ - private boolean checkCopyrightForFile(File changedFile) throws MojoExecutionException { - try (BufferedReader reader = new BufferedReader(new FileReader(changedFile))) { - final CommentParser commentParser = CommentParser.createParserForFile(changedFile.getPath()); - String line; - while ((line = reader.readLine()) != null) { - commentParser.consumeLine(line); - if (commentParser.isCommentLine() - && line.toLowerCase().trim().contains("copyright") - && line.contains(currentYear.toString()) - && line.contains(copyrightOwnerToken)) { - return true; - } - } - - return false; - } catch (IOException ioe) { - throw new MojoExecutionException("Could not read file " + changedFile.getPath() - + " to check copyright date. No further copyright date checking will be performed."); - } - } -} diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java deleted file mode 100644 index a3d6abcb1..000000000 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/UpdateCopyrightMojo.java +++ /dev/null @@ -1,432 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2015-2016 ForgeRock AS. - */ -package org.forgerock.maven; - -import static java.util.regex.Pattern.*; - -import static org.apache.maven.plugins.annotations.LifecyclePhase.*; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; -import org.apache.maven.plugins.annotations.Mojo; -import org.apache.maven.plugins.annotations.Parameter; -import org.forgerock.util.Utils; - -/** - * This goals can be used to automatically updates copyrights of modified files. - * - *

- * Copyright sections must respect the following format: - * 

- *    (.)* //This line references 0..N lines.
- *    [COMMMENT_CHAR][lineBeforeCopyrightRegExp]
- *    [COMMMENT_CHAR]* //This line references 0..N commented empty lines.
- *    ([COMMMENT_CHAR][oldCopyrightToken])*
- *    ([COMMMENT_CHAR] [YEAR] [copyrightEndToken])?
- *
- *

- * Formatter details: - *

    - *
  • COMMENT_CHAR: Auto-detected by plugin. - * Comment character used in comment blocks ('*' for Java, '!' for xml...)
    • - * - *
  • lineBeforeCopyrightRegExp: Parameter regExp case insensitive - * Used by the plugin to start it's inspection for the copyright line. - * Next non blank commented lines after this lines must be - * old copyright owner lines or/and old ForgeRock copyright lines.
    • - * - *
  • oldCopyrightToken: Detected by plugin ('copyright' keyword case insensitive) - * If one line contains this token, the plugin will use - * the newPortionsCopyrightLabel instead of the newCopyrightLabel - * if there is no ForgeRock copyrighted line.
    • - * - *
  • forgerockCopyrightRegExp: Parameter regExp case insensitive - * The regular expression which identifies a copyrighted line as a ForgeRock one.
    • - * - *
  • YEAR: Computed by plugin - * Current year if there is no existing copyright line. - * If the copyright section already exists, the year will be updated as follow: - *
      - *
    • OLD_YEAR => OLD_YEAR-CURRENT_YEAR
      • - *
    • VERY_OLD_YEAR-OLD_YEAR => VERY_OLD_YEAR-CURRENT_YEAR
      • - *
    • - *
- *

- *

- * If no ForgeRock copyrighted line is detected, the plugin will add according to the following format - *

    - *
  • If there is one or more old copyright lines: - * 
    - *              [COMMMENT_CHAR][lineBeforeCopyrightRegExp]
- *              [COMMMENT_CHAR]* //This line references 0..N commented empty lines.
- *              ([COMMMENT_CHAR][oldCopyrightToken])*
- *              [indent][newPortionsCopyrightLabel] [YEAR] [forgerockCopyrightLabel]
- *

    • - *
  • If there is no old copyright lines: - * 
    - *              [COMMMENT_CHAR][lineBeforeCopyrightRegExp]
- *              [COMMMENT_CHAR]*{nbLinesToSkip} //This line nbLinesToSkip commented empty lines.
- *              [indent][newCopyrightLabel] [YEAR] [forgerockCopyrightLabel]
- *
    • - *
- * - */ -@Mojo(name = "update-copyright", defaultPhase = VALIDATE) -public class UpdateCopyrightMojo extends CopyrightAbstractMojo { - - private final class UpdateCopyrightFile { - private final String filePath; - private final List bufferedLines = new LinkedList<>(); - private boolean copyrightUpdated; - private boolean lineBeforeCopyrightReaded; - private boolean commentBlockEnded; - private boolean portionsCopyrightNeeded; - private boolean copyrightSectionPresent; - private CommentParser commentParser; - private String curLine; - private Integer startYear; - private Integer endYear; - private final BufferedReader reader; - private final BufferedWriter writer; - - private UpdateCopyrightFile(String filePath) throws IOException { - this.filePath = filePath; - reader = new BufferedReader(new FileReader(filePath)); - commentParser = CommentParser.createParserForFile(filePath); - final File tmpFile = new File(filePath + ".tmp"); - if (!tmpFile.exists()) { - tmpFile.createNewFile(); - } - writer = new BufferedWriter(new FileWriter(tmpFile)); - } - - private void updateCopyrightForFile() throws MojoExecutionException { - try { - readLineBeforeCopyrightToken(); - portionsCopyrightNeeded = readOldCopyrightLine(); - copyrightSectionPresent = readCopyrightLine(); - writeCopyrightLine(); - writeChanges(); - } catch (final Exception e) { - throw new MojoExecutionException(e.getMessage(), e); - } finally { - Utils.closeSilently(reader, writer); - } - } - - private void writeChanges() throws Exception { - while (curLine != null) { - nextLine(); - } - reader.close(); - - for (final String line : bufferedLines) { - writer.write(line); - writer.newLine(); - } - writer.close(); - - if (!dryRun) { - final File updatedFile = new File(filePath); - if (!updatedFile.delete()) { - throw new Exception("impossible to perform rename on the file."); - } - new File(filePath + ".tmp").renameTo(updatedFile); - } - } - - private void writeCopyrightLine() throws Exception { - if (copyrightSectionPresent) { - updateExistingCopyrightLine(); - copyrightUpdated = true; - return; - } - - int indexAdd = bufferedLines.size() - 1; - final Pattern stopRegExp = portionsCopyrightNeeded ? OLD_COPYRIGHT_REGEXP - : lineBeforeCopyrightCompiledRegExp; - String previousLine = curLine; - while (!lineMatches(previousLine, stopRegExp)) { - indexAdd--; - previousLine = bufferedLines.get(indexAdd); - } - indexAdd++; - final String newCommentedLine = commentParser.getNewCommentedLine(previousLine); - if (!portionsCopyrightNeeded) { - for (int i = 0; i < nbLinesToSkip; i++) { - if (!bufferedLines.get(indexAdd).equals(newCommentedLine)) { - // We have a blank line already so do not add a new one. - bufferedLines.add(indexAdd, newCommentedLine); - } - indexAdd++; - } - } - final String newCopyrightLine = newCommentedLine - + indent() + (portionsCopyrightNeeded ? newPortionsCopyrightLabel : newCopyrightLabel) - + " " + currentYear + " " + forgeRockCopyrightLabel; - bufferedLines.add(indexAdd, newCopyrightLine); - copyrightUpdated = true; - } - - private void updateExistingCopyrightLine() throws Exception { - readYearSection(); - final String newCopyrightLine; - if (endYear == null) { - // OLD_YEAR => OLD_YEAR-CURRENT_YEAR - newCopyrightLine = curLine.replace(startYear.toString(), intervalToString(startYear, currentYear)); - } else { - // VERY_OLD_YEAR-OLD_YEAR => VERY_OLD_YEAR-CURRENT_YEAR - newCopyrightLine = curLine.replace(intervalToString(startYear, endYear), - intervalToString(startYear, currentYear)); - } - bufferedLines.remove(bufferedLines.size() - 1); - bufferedLines.add(newCopyrightLine); - } - - private void readYearSection() throws Exception { - final String copyrightLineRegExp = ".*\\s+(\\d{4})(-(\\d{4}))?\\s+" + forgerockCopyrightRegExp + ".*"; - final Matcher copyrightMatcher = Pattern.compile(copyrightLineRegExp, CASE_INSENSITIVE).matcher(curLine); - if (copyrightMatcher.matches()) { - startYear = Integer.parseInt(copyrightMatcher.group(1)); - final String endYearString = copyrightMatcher.group(3); - if (endYearString != null) { - endYear = Integer.parseInt(endYearString); - } - } else { - throw new Exception("Malformed year section in copyright line " + curLine); - } - } - - private void readLineBeforeCopyrightToken() throws Exception { - nextLine(); - while (curLine != null) { - if (curLineMatches(lineBeforeCopyrightCompiledRegExp)) { - if (!commentParser.isCommentLine()) { - throw new Exception("The line before copyright token must be a commented line"); - } - lineBeforeCopyrightReaded = true; - return; - } else if (commentBlockEnded) { - throw new Exception("unexpected non commented line found before copyright section"); - } - nextLine(); - } - } - - private boolean readOldCopyrightLine() throws Exception { - nextLine(); - while (curLine != null) { - if (isOldCopyrightOwnerLine()) { - return true; - } else if (commentParser.isNonEmptyCommentedLine() - || isCopyrightLine() - || commentBlockEnded) { - return false; - } - nextLine(); - } - throw new Exception("unexpected end of file while trying to read copyright"); - } - - private boolean readCopyrightLine() throws Exception { - while (curLine != null) { - if (isCopyrightLine()) { - return true; - } else if ((commentParser.isNonEmptyCommentedLine() && !isOldCopyrightOwnerLine()) - || commentBlockEnded) { - return false; - } - nextLine(); - } - throw new Exception("unexpected end of file while trying to read copyright"); - } - - private boolean isOldCopyrightOwnerLine() { - return curLineMatches(OLD_COPYRIGHT_REGEXP) && !curLineMatches(copyrightOwnerCompiledRegExp); - } - - private boolean isCopyrightLine() { - return curLineMatches(copyrightOwnerCompiledRegExp); - } - - private boolean curLineMatches(Pattern compiledRegExp) { - return lineMatches(curLine, compiledRegExp); - } - - private boolean lineMatches(String line, Pattern compiledRegExp) { - return compiledRegExp.matcher(line).matches(); - } - - private void nextLine() throws Exception { - curLine = reader.readLine(); - commentParser.consumeLine(curLine); - if (curLine == null && !copyrightUpdated) { - throw new Exception("unexpected end of file while trying to read copyright"); - } else if (curLine != null) { - bufferedLines.add(curLine); - } - - if (!copyrightUpdated) { - if (lineBeforeCopyrightReaded && !commentParser.isCommentLine()) { - commentBlockEnded = true; - } - } - } - } - - private static final Pattern OLD_COPYRIGHT_REGEXP = Pattern.compile(".*copyright.*", CASE_INSENSITIVE); - - /** - * Number of lines to add after the line which contains the lineBeforeCopyrightToken. - * Used only if a new copyright line is needed. - */ - @Parameter(required = true, defaultValue = "1") - private Integer nbLinesToSkip; - - /** - * Number of spaces to add after the comment line token before adding new - * copyright section. Used only if a new copyright or portion copyright is - * needed. - */ - @Parameter(required = true, defaultValue = "1") - private Integer numberSpaceIdentation; - - /** The last non empty commented line before the copyright section. */ - @Parameter(required = true, defaultValue = "\\\"Portions Copyright \\[year\\] \\[name of copyright owner\\]\\\"") - private String lineBeforeCopyrightRegExp; - - /** The regular expression which identifies a copyrighted line. */ - @Parameter(required = true, defaultValue = "ForgeRock\\s+AS") - private String forgerockCopyrightRegExp; - - /** Line to add if there is no existing copyright. */ - @Parameter(required = true, defaultValue = "Copyright") - private String newCopyrightLabel; - - /** Portions copyright start line token. */ - @Parameter(required = true, defaultValue = "Portions Copyright") - private String newPortionsCopyrightLabel; - - /** ForgeRock copyright label to print if a new (portions) copyright line is needed. */ - @Parameter(required = true, defaultValue = "ForgeRock AS.") - private String forgeRockCopyrightLabel; - - /** A dry run will not change source code. It creates new files with '.tmp' extension. */ - @Parameter(required = true, defaultValue = "false") - private boolean dryRun; - - /** RegExps corresponding to user token. */ - private Pattern lineBeforeCopyrightCompiledRegExp; - private Pattern copyrightOwnerCompiledRegExp; - - private boolean buildOK = true; - - - /** - * Updates copyright of modified files. - * - * @throws MojoFailureException - * if any - * @throws MojoExecutionException - * if any - */ - @Override - public void execute() throws MojoExecutionException, MojoFailureException { - compileRegExps(); - checkCopyrights(); - for (final String filePath : getIncorrectCopyrightFilePaths()) { - try { - new UpdateCopyrightFile(filePath).updateCopyrightForFile(); - getLog().info("Copyright of file " + filePath + " has been successfully updated."); - } catch (final Exception e) { - getLog().error("Impossible to update copyright of file " + filePath); - getLog().error(" Details: " + e.getMessage()); - getLog().error(" No modification has been performed on this file"); - buildOK = false; - } - } - - if (!buildOK) { - throw new MojoFailureException("Error(s) occured while trying to update some copyrights."); - } - } - - private void compileRegExps() { - lineBeforeCopyrightCompiledRegExp = compileRegExp(lineBeforeCopyrightRegExp); - copyrightOwnerCompiledRegExp = compileRegExp(forgerockCopyrightRegExp); - } - - private Pattern compileRegExp(String regExp) { - return Pattern.compile(".*" + regExp + ".*", CASE_INSENSITIVE); - } - - private String intervalToString(Integer startYear, Integer endYear) { - return startYear + "-" + endYear; - } - - private String indent() { - String indentation = ""; - for (int i = 0; i < numberSpaceIdentation; i++) { - indentation += " "; - } - return indentation; - } - - // Setters to allow tests - - void setLineBeforeCopyrightToken(String lineBeforeCopyrightToken) { - this.lineBeforeCopyrightRegExp = lineBeforeCopyrightToken; - } - - void setNbLinesToSkip(Integer nbLinesToSkip) { - this.nbLinesToSkip = nbLinesToSkip; - } - - void setNumberSpaceIdentation(Integer numberSpaceIdentation) { - this.numberSpaceIdentation = numberSpaceIdentation; - } - - void setNewPortionsCopyrightString(String portionsCopyrightString) { - this.newPortionsCopyrightLabel = portionsCopyrightString; - } - - void setNewCopyrightOwnerString(String newCopyrightOwnerString) { - this.forgeRockCopyrightLabel = newCopyrightOwnerString; - } - - void setNewCopyrightStartToken(String copyrightStartString) { - this.newCopyrightLabel = copyrightStartString; - } - - void setCopyrightEndToken(String copyrightEndToken) { - this.forgerockCopyrightRegExp = copyrightEndToken; - } - - void setDryRun(final boolean dryRun) { - this.dryRun = dryRun; - } -} diff --git a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java b/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java deleted file mode 100644 index 97eece17f..000000000 --- a/opendj-copyright-maven-plugin/src/main/java/org/forgerock/maven/package-info.java +++ /dev/null @@ -1,19 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2015 ForgeRock AS. - */ - -/** Classes implementing the maven plugin to check and update source file copyrights. */ -package org.forgerock.maven; - diff --git a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java b/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java deleted file mode 100644 index d71bc81f7..000000000 --- a/opendj-copyright-maven-plugin/src/test/java/org/forgerock/maven/UpdateCopyrightTestCase.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions Copyright [year] [name of copyright owner]". - * - * Copyright 2015-2016 ForgeRock AS. - */ -package org.forgerock.maven; - -import static org.mockito.Mockito.*; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.FilenameFilter; -import java.util.Calendar; -import java.util.LinkedList; -import java.util.List; - -import org.forgerock.testng.ForgeRockTestCase; -import org.testng.annotations.AfterTest; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; - -@Test -public class UpdateCopyrightTestCase extends ForgeRockTestCase { - - private final class FilenameExtensionFilter implements FilenameFilter { - private final String extension; - - private FilenameExtensionFilter(String suffix) { - this.extension = suffix; - } - - @Override - public boolean accept(File directory, String fileName) { - return fileName.endsWith(extension); - } - } - - private static final String CURRENT_YEAR = Integer.toString(Calendar.getInstance().get(Calendar.YEAR)); - private static final String RESOURCE_DIR = "src/test/resources/files/"; - private static final String[] TEST_FOLDERS = { "forgerock-copyrights", "openidm-copyrights"}; - - /** Customs tags in tests files. */ - private static final String MUST_BE_REMOVED_TAG = "MUST BE REMOVED:"; - private static final String EXPECTED_OUTPUT_TAG = "EXPECTED OUTPUT:"; - private static final String YEAR_TAG = "YEAR"; - - @AfterTest - public void deleteTempFiles() { - FilenameFilter tmpFilter = new FilenameExtensionFilter(".tmp"); - for (String testFolder : TEST_FOLDERS) { - for (File file : new File(RESOURCE_DIR, testFolder).listFiles(tmpFilter)) { - file.delete(); - } - } - } - - @DataProvider - public Object[][] testCases() { - return new Object[][] { - // Test case folder, Line before copyright regexp, NB lines to skip, NB spaces indentation, - // New portion copyright string, New copyright start string, Copyright end regexp, - // New copyright end String - { TEST_FOLDERS[0], "Portions\\s+Copyright\\s+\\[year\\]\\s+\\[name\\s+of\\s+copyright\\s+owner\\]", - 1, 1, "Portions copyright", "Copyright", "ForgeRock\\s+AS", "ForgeRock AS." }, - { TEST_FOLDERS[1], - "DO\\s+NOT\\s+ALTER\\s+OR\\s+REMOVE\\s+COPYRIGHT\\s+NOTICES\\s+OR\\s+THIS\\s+HEADER.", 1, 1, - "Portions Copyrighted", "Copyright (c)", "ForgeRock\\s+AS\\.", - "ForgeRock AS. All rights reserved." } - }; - } - - @Test(dataProvider = "testCases") - public void testUpdateCopyright(String testCaseFolderPath, String lineBeforeCopyrightToken, - int nbLinesToSkip, int numberSpacesIndentation, String newPortionCopyrightString, - String newCopyrightStartString, String copyrightEndToken, String newCopyrightOwnerStr) throws Exception { - List testFilePaths = new LinkedList<>(); - List updatedTestFilePaths = new LinkedList<>(); - - File[] changedFiles = new File(RESOURCE_DIR, testCaseFolderPath) - .listFiles(new FilenameExtensionFilter(".txt")); - for (File file : changedFiles) { - testFilePaths.add(file.getAbsolutePath()); - updatedTestFilePaths.add(new File(file.getPath() + ".tmp")); - } - - UpdateCopyrightMojo spyMojo = spy(new UpdateCopyrightMojo()); - spyMojo.setDryRun(true); - spyMojo.setLineBeforeCopyrightToken(lineBeforeCopyrightToken); - spyMojo.setNbLinesToSkip(nbLinesToSkip); - spyMojo.setNumberSpaceIdentation(numberSpacesIndentation); - spyMojo.setNewPortionsCopyrightString(newPortionCopyrightString); - spyMojo.setNewCopyrightStartToken(newCopyrightStartString); - spyMojo.setNewCopyrightOwnerString(newCopyrightOwnerStr); - spyMojo.setCopyrightEndToken(copyrightEndToken); - - doNothing().when(spyMojo).checkCopyrights(); - when(spyMojo.getIncorrectCopyrightFilePaths()).thenReturn(testFilePaths); - spyMojo.execute(); - - // Check copyrights of updated files - CheckCopyrightMojo spyMojoCheck = spy(new CheckCopyrightMojo()); - doReturn(updatedTestFilePaths).when(spyMojoCheck).getChangedFiles(); - spyMojoCheck.execute(); - - // Check updated files content - for (String filePath : testFilePaths) { - checkMofidiedFile(filePath); - } - } - - private void checkMofidiedFile(String filePath) throws Exception { - try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { - String mustBeRemoved = null; - String expectedOutput = null; - String currentLine; - while ((currentLine = reader.readLine()) != null) { - if (currentLine.contains(MUST_BE_REMOVED_TAG)) { - mustBeRemoved = currentLine.split(MUST_BE_REMOVED_TAG)[1].trim(); - } else if (currentLine.contains(EXPECTED_OUTPUT_TAG)) { - expectedOutput = currentLine.split(EXPECTED_OUTPUT_TAG)[1].trim() - .replace(YEAR_TAG, CURRENT_YEAR); - } - } - checkIfNewFileIsValid(mustBeRemoved, expectedOutput, filePath + ".tmp"); - } - } - - - private void checkIfNewFileIsValid(String mustBeRemoved, String expectedOutput, String filePath) throws Exception { - if (mustBeRemoved == null && expectedOutput == null) { - return; - } - - try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) { - boolean expectedOutputFound = false; - String currentLine; - while ((currentLine = reader.readLine()) != null) { - if (lineContainsTagContent(currentLine, mustBeRemoved)) { - throw new Exception("Generated file " + filePath + " must not contains " + mustBeRemoved); - } - - if (!expectedOutputFound && lineContainsTagContent(currentLine, expectedOutput)) { - expectedOutputFound = true; - if (mustBeRemoved == null) { - return; - } - } - } - if (!expectedOutputFound) { - throw new Exception("Generated file " + filePath + " should contains " + expectedOutput); - } - } - } - - - private boolean lineContainsTagContent(String line, String content) { - String trimedLine = line.trim(); - return content != null - && !trimedLine.startsWith(MUST_BE_REMOVED_TAG) - && !trimedLine.startsWith(MUST_BE_REMOVED_TAG) - && trimedLine.contains(content); - } -} diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java deleted file mode 100644 index 090cf595d..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-1.java +++ /dev/null @@ -1,18 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - * Copyright 2012-2014 ForgeRock AS. - */ - - MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS. - EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c deleted file mode 100644 index e89d8389e..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-2.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - * Copyright 2010 ForgeRock AS. - */ - -MUST BE REMOVED: Copyright 2010 ForgeRock AS. -EXPECTED OUTPUT: Copyright 2010-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java deleted file mode 100644 index 7f738e29e..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-3.java +++ /dev/null @@ -1,16 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - */ - - EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h deleted file mode 100644 index 9bf2ebe14..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-4.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - * Copyright 2010 Old Copyright Owner Inc. - */ - - EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt deleted file mode 100644 index d785efa12..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-5.txt +++ /dev/null @@ -1,18 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - * copyright 2010-2012 Very Old copyright owner Inc. - * copyright 2013-2014 Old copyright owner Inc. - */ - - EXPECTED OUTPUT: Portions copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt deleted file mode 100644 index edffc9532..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-6.txt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * The contents of this file are subject to the terms of the Common Development and - * Distribution License (the License). You may not use this file except in compliance with the - * License. - * - * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the - * specific language governing permission and limitations under the License. - * - * When distributing Covered Software, include this CDDL Header Notice in each file and include - * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL - * Header, with the fields enclosed by brackets [] replaced by your own identifying - * information: "Portions copyright [year] [name of copyright owner]". - * - * Copyright 2008-2010 Very Old copyright owner Inc. - * Portions copyright 2011-2012 Old copyright owner Inc. - * Portions copyright 2013-2014 ForgeRock AS. - */ - -MUST BE REMOVED: Portions copyright 2013-2014 ForgeRock AS. -EXPECTED OUTPUT: Portions copyright 2013-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html deleted file mode 100644 index 93f92afeb..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-7.html +++ /dev/null @@ -1,19 +0,0 @@ - - - -MUST BE REMOVED: Copyright 2012-2014 ForgeRock AS. -EXPECTED OUTPUT: Copyright 2012-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml deleted file mode 100644 index 66a3306c8..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-8.xml +++ /dev/null @@ -1,18 +0,0 @@ - - -MUST BE REMOVED: Copyright 2013 ForgeRock AS. -EXPECTED OUTPUT: Copyright 2013-YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl b/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl deleted file mode 100644 index dc3b26e1a..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/forgerock-copyrights/forgerock-bad-copyright-9.xsl +++ /dev/null @@ -1,16 +0,0 @@ - - -EXPECTED OUTPUT: Copyright YEAR ForgeRock AS. diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java deleted file mode 100644 index e01ee4e73..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-1.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2011-2014 ForgeRock AS. All rights reserved. - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - -MUST BE REMOVED: Copyright (c) 2011-2014 ForgeRock AS. All rights reserved. -EXPECTED OUTPUT: Copyright (c) 2011-YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java deleted file mode 100644 index d748d883c..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-2.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2012 ForgeRock AS. All rights reserved. - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - -MUST BE REMOVED: Copyright (c) 2012 ForgeRock AS. All rights reserved. -EXPECTED OUTPUT: Copyright (c) 2012-YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java deleted file mode 100644 index 20a378fc6..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-3.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - -EXPECTED OUTPUT: Copyright (c) YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java deleted file mode 100644 index 5f5a5150c..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-4.java +++ /dev/null @@ -1,25 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2010-2011 Old Copyright Owner. - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - - EXPECTED OUTPUT: Portions Copyrighted YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java deleted file mode 100644 index 2e8c5d980..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-5.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2010-2011 Very Old Copyright Owner. - * Copyright (c) 2012-2013 Old Copyright Owner. - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - - EXPECTED OUTPUT: Portions Copyrighted YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java b/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java deleted file mode 100644 index e05d576e6..000000000 --- a/opendj-copyright-maven-plugin/src/test/resources/files/openidm-copyrights/openidm-bad-copyright-6.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright (c) 2010-2011 Very Old Copyright Owner. - * Portions Copyrighted 2012-2013 Old Copyright Owner. - * Portions Copyrighted 2013-2014 ForgeRock AS. All rights reserved. - * - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * http://forgerock.org/license/CDDLv1.0.html - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at http://forgerock.org/license/CDDLv1.0.html - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - */ - -MUST BE REMOVED: Portions Copyrighted 2013-2014 ForgeRock AS. All rights reserved. -EXPECTED OUTPUT: Portions Copyrighted 2013-YEAR ForgeRock AS. All rights reserved. \ No newline at end of file diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index 088aa2534..f739537f9 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -35,7 +35,6 @@ - ../opendj-copyright-maven-plugin ../opendj-doc-maven-plugin ../opendj-core ../opendj-grizzly From 3618e852f64302add7a27ea3c0e1c4b631704329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Thu, 10 Mar 2016 11:14:22 +0100 Subject: [PATCH 078/125] OPENDJSDK-89 UUID syntax should have an equality matching rule UUIDSyntaxImpl.java: Implemented getEqualityMatchingRule() and getOrderingMatchingRule(). --- .../opendj/ldap/schema/UUIDSyntaxImpl.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java index eb563469a..29911ad74 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java @@ -14,12 +14,14 @@ * Copyright 2009 Sun Microsystems, Inc. * Portions Copyright 2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import static com.forgerock.opendj.ldap.CoreMessages.WARN_ATTR_SYNTAX_UUID_EXPECTED_DASH; import static com.forgerock.opendj.ldap.CoreMessages.WARN_ATTR_SYNTAX_UUID_EXPECTED_HEX; import static com.forgerock.opendj.ldap.CoreMessages.WARN_ATTR_SYNTAX_UUID_INVALID_LENGTH; + +import static org.forgerock.opendj.ldap.schema.SchemaConstants.EMR_UUID_OID; +import static org.forgerock.opendj.ldap.schema.SchemaConstants.OMR_UUID_OID; import static org.forgerock.opendj.ldap.schema.SchemaConstants.SYNTAX_UUID_NAME; import org.forgerock.i18n.LocalizableMessageBuilder; @@ -40,6 +42,16 @@ public boolean isHumanReadable() { return true; } + @Override + public String getEqualityMatchingRule() { + return EMR_UUID_OID; + } + + @Override + public String getOrderingMatchingRule() { + return OMR_UUID_OID; + } + @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { From cd4f787f22a983443ac427fe2dd8e42804360270 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Wed, 9 Mar 2016 16:21:54 +0100 Subject: [PATCH 079/125] OPENDJ-2505 Makeldif supports line folding * makeldif now supports line folding as explained in LDIF RFC 2849 (https://www.ietf.org/rfc/rfc2849.txt) * Add unit test to ensure non regression --- .../forgerock/opendj/ldif/TemplateFile.java | 18 +++++--- .../com/forgerock/opendj/ldap/core.properties | 5 ++- .../opendj/ldap/tools/MakeLDIFITCase.java | 42 +++++++++++++++++-- .../src/test/resources/expected_output.ldif | 11 +++++ .../test/resources/invalid_test_template.ldif | 29 +++++++++++++ .../test/resources/valid_test_template.ldif | 28 +++++++++++++ 6 files changed, 123 insertions(+), 10 deletions(-) create mode 100644 opendj-ldap-toolkit/src/test/resources/expected_output.ldif create mode 100644 opendj-ldap-toolkit/src/test/resources/invalid_test_template.ldif create mode 100644 opendj-ldap-toolkit/src/test/resources/valid_test_template.ldif diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java index a8c6887f6..28113c514 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2006-2009 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS. + * Portions Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -1240,12 +1240,18 @@ String[] getLines(String identifier, final BufferedReader reader) throws IOExcep */ private List readLines(final BufferedReader reader) throws IOException { final List lines = new ArrayList<>(); - while (true) { - final String line = reader.readLine(); - if (line == null) { - break; + String line; + for (int lineNumber = 1; (line = reader.readLine()) != null; lineNumber++) { + if (line.startsWith(" ")) { + final int lastLineIndex = lines.size() - 1; + final String previousLine = lines.get(lastLineIndex); + if (lines.isEmpty() || previousLine.isEmpty()) { + throw DecodeException.fatalError(ERR_TEMPLATE_FILE_INVALID_LEADING_SPACE.get(lineNumber, line)); + } + lines.set(lastLineIndex, previousLine + line.substring(1)); + } else { + lines.add(line); } - lines.add(line); } return lines; } diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 13156393d..77056c7f5 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -1619,7 +1619,10 @@ ERR_TRANSACTION_ID_CONTROL_BAD_OID=Cannot decode the provided \ ERR_TRANSACTION_ID_CONTROL_DECODE_NULL=Cannot decode the provided ASN.1 \ element as a transaction id control because it did not have a value, when \ a value must always be provided - +ERR_TEMPLATE_FILE_INVALID_LEADING_SPACE=Unable to parse line %d ("%s") from the \ + template file because the line started with a space but there were no previous \ + lines in the entry to which this line could be appended + # Labels for generated documentation DOC_LOCALE_TAG=Code tag: %s DOC_LOCALE_OID=Collation order object identifier: %s diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java index 53787f8f3..3fa67dec5 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java @@ -11,17 +11,22 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package com.forgerock.opendj.ldap.tools; import static org.fest.assertions.Assertions.*; import static org.forgerock.util.Utils.*; +import static com.forgerock.opendj.ldap.CoreMessages.*; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.CliMessages.INFO_GLOBAL_HELP_REFERENCE; +import java.io.IOException; import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; import org.forgerock.i18n.LocalizableMessage; import org.forgerock.opendj.ldap.ByteStringBuilder; @@ -33,6 +38,13 @@ @SuppressWarnings("javadoc") public class MakeLDIFITCase extends ToolsITCase { + private static final String TEMP_OUTPUT_FILE = ".temp_test_file.ldif"; + private static final String TEST_RESOURCE_PATH = "src/test/resources"; + private static final String VALID_TEMPLATE_FILE_PATH = + Paths.get(TEST_RESOURCE_PATH, "valid_test_template.ldif").toString(); + private static final boolean SUCCESS = true; + private static final boolean FAILURE = false; + private ByteStringBuilder out; private ByteStringBuilder err; private PrintStream outStream; @@ -93,13 +105,37 @@ Object[][] invalidArguments() throws Exception { @Test(dataProvider = "validArguments") public void testMakeLDIFValidUseCases(final String[] arguments, final LocalizableMessage expectedOut) throws Exception { - run(arguments, true, expectedOut); + run(arguments, SUCCESS, expectedOut); } @Test(dataProvider = "invalidArguments") public void testMakeLDIFInvalidUseCases(final String[] arguments, final LocalizableMessage expectedErr) throws Exception { - run(arguments, false, expectedErr); + run(arguments, FAILURE, expectedErr); + } + + /** See OPENDJ-2505 */ + @Test + public void testMakeLDIFInvalidLineFolding() throws Exception { + final LocalizableMessage expectedOutput = ERR_LDIF_GEN_TOOL_EXCEPTION_DURING_PARSE.get( + ERR_TEMPLATE_FILE_INVALID_LEADING_SPACE.get( + 27, " \"lineFoldingTest\":\\[\"This line should not be accepted by the parser\"\\],")); + run(args("src/test/resources/invalid_test_template.ldif"), FAILURE, expectedOutput); + } + + /** See OPENDJ-2505 */ + @Test + public void testMakeLDIFSupportsLineFolding() throws Exception { + final Path tempOutputFile = Paths.get(TEST_RESOURCE_PATH, TEMP_OUTPUT_FILE); + run(args("-o", tempOutputFile.toString(), VALID_TEMPLATE_FILE_PATH), + SUCCESS, INFO_MAKELDIF_PROCESSING_COMPLETE.get(2)); + assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output.ldif"); + Files.delete(tempOutputFile); + } + + /** See OPENDJ-2505 and OPENDJ-2754 */ + assertThat(Files.readAllBytes(Paths.get(TEST_RESOURCE_PATH, outputFile))).isEqualTo( + Files.readAllBytes(Paths.get(TEST_RESOURCE_PATH, expectedOutputFileName))); } private void run(final String[] arguments, final boolean expectsSuccess, final LocalizableMessage expectedOutput) diff --git a/opendj-ldap-toolkit/src/test/resources/expected_output.ldif b/opendj-ldap-toolkit/src/test/resources/expected_output.ldif new file mode 100644 index 000000000..e5095ca30 --- /dev/null +++ b/opendj-ldap-toolkit/src/test/resources/expected_output.ldif @@ -0,0 +1,11 @@ +dn: dc=example,dc=com +dc: example + +dn: coretokenid=tokenId,dc=example,dc=com +coretokenid: tokenId +objectClass: top +objectClass: frCoreToken +coretokenstring08: /myrealm +coretokenstring07: Bearer +coretokenobject: {"redirectURI":["http://fake.com"],"acr":[],"clientID":["clientOIDC"],"lineFoldingTest":["This line should have been correctly folded"],"tokenName":["refresh_token"],"authModules":["LDAP"],"realm":["/myrealm"],"id":["fakeid"],"userName":["johndoe"],"tokenType":["Bearer"]} + diff --git a/opendj-ldap-toolkit/src/test/resources/invalid_test_template.ldif b/opendj-ldap-toolkit/src/test/resources/invalid_test_template.ldif new file mode 100644 index 000000000..d62975414 --- /dev/null +++ b/opendj-ldap-toolkit/src/test/resources/invalid_test_template.ldif @@ -0,0 +1,29 @@ +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. + +branch: dc=example,dc=com +subordinateTemplate: refreshToken:10 + +template: refreshToken +rdnAttr: coreTokenId +coreTokenId: ---- +objectClass: top +objectClass: frCoreToken +coreTokenString08: /myrealm +coreTokenString07: Bearer +coreTokenObject: \{"redirectURI":\["http://fake.com"\],"acr":\[\],"clientID":\["clientOIDC"\], + + "lineFoldingTest":\["This line should not be accepted by the parser"\], + "tokenName":\["refresh_token"\],"authModules":\["LDAP"\],"realm":\["{coreTokenString08}"\], + "id":\["fakeid"\],"userName":\["johndoe"\],"tokenType":\["Bearer"\]\} \ No newline at end of file diff --git a/opendj-ldap-toolkit/src/test/resources/valid_test_template.ldif b/opendj-ldap-toolkit/src/test/resources/valid_test_template.ldif new file mode 100644 index 000000000..fa3f0c3b7 --- /dev/null +++ b/opendj-ldap-toolkit/src/test/resources/valid_test_template.ldif @@ -0,0 +1,28 @@ +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. + +branch: dc=example,dc=com +subordinateTemplate: refreshToken:1 + +template: refreshToken +rdnAttr: coreTokenId +coreTokenId: tokenId +objectClass: top +objectClass: frCoreToken +coreTokenString08: /myrealm +coreTokenString07: Bearer +coreTokenObject: \{"redirectURI":\["http://fake.com"\],"acr":\[\],"clientID":\["clientOIDC"\], + "lineFoldingTest":\["This line should have been correctly folded"\], + "tokenName":\["refresh_token"\],"authModules":\["LDAP"\],"realm":\["{coreTokenString08}"\], + "id":\["fakeid"\],"userName":\["johndoe"\],"tokenType":\["Bearer"\]\} \ No newline at end of file From 78cebc4629b840ca4ec876523c771d975de6feb9 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 7 Mar 2016 18:07:23 +0100 Subject: [PATCH 080/125] OPENDJ-2754 Add wrapColumn option to makeldif * Add -w, --wrapColumn {wrapColumn} option to makeldif to allow a user to ask for line wrapping in the result file. This is a new feature which might be useful for a user since line folding is supported in ldif template files (see OPENDJ-2505). * Add a unit test to ensure non regression --- .../forgerock/opendj/ldap/tools/MakeLDIF.java | 45 ++++++++++++++----- .../opendj/ldap/tools/tools.properties | 3 ++ .../opendj/ldap/tools/tools_ca_ES.properties | 20 +++++++++ .../opendj/ldap/tools/tools_de.properties | 5 +++ .../opendj/ldap/tools/tools_es.properties | 5 +++ .../opendj/ldap/tools/tools_fr.properties | 5 +++ .../opendj/ldap/tools/tools_ja.properties | 5 +++ .../opendj/ldap/tools/tools_ko.properties | 5 +++ .../opendj/ldap/tools/tools_pl.properties | 20 +++++++++ .../opendj/ldap/tools/tools_zh_CN.properties | 5 +++ .../opendj/ldap/tools/tools_zh_TW.properties | 5 +++ .../opendj/ldap/tools/MakeLDIFITCase.java | 10 +++++ .../resources/expected_output_80_column.ldif | 14 ++++++ 13 files changed, 135 insertions(+), 12 deletions(-) create mode 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ca_ES.properties create mode 100644 opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_pl.properties create mode 100644 opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java index 93ae75eda..a150056fb 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/MakeLDIF.java @@ -20,6 +20,7 @@ import static com.forgerock.opendj.cli.ToolVersionHandler.newSdkVersionHandler; import static com.forgerock.opendj.ldap.tools.ToolsMessages.*; import static com.forgerock.opendj.cli.Utils.filterExitCode; +import static com.forgerock.opendj.ldap.tools.ToolsMessages.INFO_MAKELDIF_WRAP_COLUMN_PLACEHOLDER; import static org.forgerock.util.Utils.closeSilently; import java.io.BufferedWriter; @@ -80,6 +81,7 @@ int run(final String[] args) { StringArgument ldifFile; StringArgument resourcePath; StringArgument constants; + IntegerArgument wrapColumn; try { resourcePath = StringArgument.builder(OPTION_LONG_RESOURCE_PATH) @@ -114,6 +116,15 @@ int run(final String[] args) { .description(INFO_MAKELDIF_DESCRIPTION_HELP.get()) .buildAndAddToParser(argParser); + wrapColumn = + IntegerArgument.builder("wrapColumn") + .shortIdentifier('w') + .description(INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN.get()) + .lowerBound(0) + .defaultValue(0) + .valuePlaceholder(INFO_MAKELDIF_WRAP_COLUMN_PLACEHOLDER.get()) + .buildAndAddToParser(argParser); + argParser.setUsageArgument(showUsage, getOutputStream()); } catch (ArgumentException ae) { errPrintln(ERR_CANNOT_INITIALIZE_ARGS.get(ae.getMessage())); @@ -132,12 +143,12 @@ int run(final String[] args) { return 0; } final String templatePath = argParser.getTrailingArguments().get(0); - return run(templatePath, resourcePath, ldifFile, randomSeed, constants); + return run(templatePath, resourcePath, ldifFile, randomSeed, constants, wrapColumn); } /** Run Make LDIF with provided arguments. */ - private int run(final String templatePath, final StringArgument resourcePath, - final StringArgument ldifFile, final IntegerArgument randomSeedArg, final StringArgument constants) { + private int run(final String templatePath, final StringArgument resourcePath, final StringArgument ldifFile, + final IntegerArgument randomSeedArg, final StringArgument constants, final IntegerArgument wrapColumn) { LDIFEntryWriter writer = null; try (EntryGenerator generator = createGenerator(templatePath, resourcePath, randomSeedArg, constants)) { if (generator == null) { @@ -150,15 +161,14 @@ private int run(final String templatePath, final StringArgument resourcePath, } } - if (ldifFile.isPresent()) { - try { - writer = new LDIFEntryWriter(new BufferedWriter(new FileWriter(new File(ldifFile.getValue())))); - } catch (IOException e) { - errPrintln(ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), e.getMessage())); - return EXIT_CODE_FAILURE; - } - } else { - writer = new LDIFEntryWriter(getOutputStream()); + try { + writer = createLdifWriter(ldifFile, wrapColumn); + } catch (final IOException e) { + errPrintln(ERR_MAKELDIF_UNABLE_TO_CREATE_LDIF.get(ldifFile.getValue(), e.getMessage())); + return EXIT_CODE_FAILURE; + } catch (final ArgumentException e) { + errPrintln(ERR_ERROR_PARSING_ARGS.get(e.getMessageObject())); + return EXIT_CODE_FAILURE; } if (!generateEntries(generator, writer, ldifFile)) { @@ -173,6 +183,17 @@ private int run(final String templatePath, final StringArgument resourcePath, } } + private LDIFEntryWriter createLdifWriter(final StringArgument ldifFile, final IntegerArgument wrapColumn) + throws IOException, ArgumentException { + final LDIFEntryWriter writer; + if (ldifFile.isPresent()) { + writer = new LDIFEntryWriter(new BufferedWriter(new FileWriter(ldifFile.getValue()))); + } else { + writer = new LDIFEntryWriter(getOutputStream()); + } + return writer.setWrapColumn(wrapColumn.getIntValue()); + } + static EntryGenerator createGenerator(final String templatePath, final StringArgument resourcePath, final IntegerArgument randomSeedArg, final StringArgument constants, final boolean generateBranches, final ConsoleApplication app) { diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties index ad61aba17..eb1b3ca40 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools.properties @@ -323,6 +323,9 @@ ERR_MAKELDIF_EXCEPTION_DURING_PROCESSING=An error occurred while \ processing : %s ERR_CONSTANT_ARG_CANNOT_DECODE=Unable to parse a constant argument \ expecting name=value but got %s +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Maximum length of an output line \ + (0 for no wrapping) +INFO_MAKELDIF_WRAP_COLUMN_PLACEHOLDER={wrapColumn} # # AddRate Tool # diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ca_ES.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ca_ES.properties new file mode 100644 index 000000000..906f8c39f --- /dev/null +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ca_ES.properties @@ -0,0 +1,20 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Columna in la qual s'envoltaran les l\u00ednies incorrectes (0 per no envoltar) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties index be888c1be..e95c4763b 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_de.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Spalte, in der lange Zeile umgebrochen werden sollen (0 f\u00fcr keinen Zeilenumbruch) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties index be888c1be..0a3db3673 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_es.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Columna en la que ajustar l\u00edneas largas (0 para ning\u00fan ajuste) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties index be888c1be..4a8219bc6 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_fr.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Taille maximum d'une ligne dans le fichier de sortie (0 = pas de limite) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties index be888c1be..c140f6781 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ja.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=\u9577\u3044\u884c\u3092\u6298\u308a\u8fd4\u3059\u6841 (0 \u306f\u6298\u308a\u8fd4\u3057\u306a\u3057) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties index be888c1be..782e4f2f7 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_ko.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=\uae34 \ud589\uc744 \ub798\ud551\ud560 \uc5f4(0 = \ub798\ud551 \uc548 \ud568) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_pl.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_pl.properties new file mode 100644 index 000000000..219edc73d --- /dev/null +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_pl.properties @@ -0,0 +1,20 @@ +# +# The contents of this file are subject to the terms of the Common Development and +# Distribution License (the License). You may not use this file except in compliance with the +# License. +# +# You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the +# specific language governing permission and limitations under the License. +# +# When distributing Covered Software, include this CDDL Header Notice in each file and include +# the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL +# Header, with the fields enclosed by brackets [] replaced by your own identifying +# information: "Portions Copyright [year] [name of copyright owner]". +# +# Copyright 2016 ForgeRock AS. +# + +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=Kolumna na kt\u00f3rej zawijane b\u0119d\u0105 d\u0142ugie linie (0 aby wy\u0142\u0105czy\u0107 zawijanie) diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties index be888c1be..cde850c7f 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_CN.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=\u5bf9\u8f83\u957f\u7684\u884c\u8fdb\u884c\u6362\u884c\u7684\u5217\uff080 \u8868\u793a\u4e0d\u6362\u884c\uff09 diff --git a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties index be888c1be..2a61a7f5d 100644 --- a/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties +++ b/opendj-ldap-toolkit/src/main/resources/com/forgerock/opendj/ldap/tools/tools_zh_TW.properties @@ -11,4 +11,9 @@ # information: "Portions Copyright [year] [name of copyright owner]". # # Copyright 2009 Sun Microsystems, Inc. +# Portions Copyright 2016 ForgeRock AS. +# +# MakeLDIF tool +# +INFO_MAKELDIF_DESCRIPTION_WRAP_COLUMN=\u8981\u5c0d\u9577\u53e5\u63db\u884c\u7684\u6b04 (0 \u8868\u793a\u4e0d\u63db\u884c) diff --git a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java index 3fa67dec5..8018c2ea6 100644 --- a/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java +++ b/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/MakeLDIFITCase.java @@ -134,6 +134,16 @@ public void testMakeLDIFSupportsLineFolding() throws Exception { } /** See OPENDJ-2505 and OPENDJ-2754 */ + @Test + public void testMakeLDIFSupportsLineFoldingAndLineWrapping() throws Exception { + final Path tempOutputFile = Paths.get(TEST_RESOURCE_PATH, TEMP_OUTPUT_FILE); + run(args("-o", tempOutputFile.toString(), "-w", "80", VALID_TEMPLATE_FILE_PATH), + SUCCESS, INFO_MAKELDIF_PROCESSING_COMPLETE.get(2)); + assertFilesAreEquals(TEMP_OUTPUT_FILE, "expected_output_80_column.ldif"); + Files.delete(tempOutputFile); + } + + private void assertFilesAreEquals(final String outputFile, final String expectedOutputFileName) throws IOException { assertThat(Files.readAllBytes(Paths.get(TEST_RESOURCE_PATH, outputFile))).isEqualTo( Files.readAllBytes(Paths.get(TEST_RESOURCE_PATH, expectedOutputFileName))); } diff --git a/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif b/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif new file mode 100644 index 000000000..45e611cc9 --- /dev/null +++ b/opendj-ldap-toolkit/src/test/resources/expected_output_80_column.ldif @@ -0,0 +1,14 @@ +dn: dc=example,dc=com +dc: example + +dn: coretokenid=tokenId,dc=example,dc=com +coretokenid: tokenId +objectClass: top +objectClass: frCoreToken +coretokenstring08: /myrealm +coretokenstring07: Bearer +coretokenobject: {"redirectURI":["http://fake.com"],"acr":[],"clientID":["client + OIDC"],"lineFoldingTest":["This line should have been correctly folded"],"token + Name":["refresh_token"],"authModules":["LDAP"],"realm":["/myrealm"],"id":["fake + id"],"userName":["johndoe"],"tokenType":["Bearer"]} + From 031d512eb8f71301afc6e0fd81d3944d1aa49cf6 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Mon, 7 Mar 2016 18:21:15 +0100 Subject: [PATCH 081/125] OPENDJ-2750 Change makeldif default random seed In order to keep the same behavior as deleted server make-ldif, use a random seed number to initialize random number generator instead of '1'. --- .../java/org/forgerock/opendj/ldif/EntryGenerator.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java index 11d673d22..a78eff2dd 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2006-2010 Sun Microsystems, Inc. - * Portions Copyright 2013-2015 ForgeRock AS. + * Portions Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -54,8 +54,6 @@ */ public final class EntryGenerator implements EntryReader { - private static final int DEFAULT_RANDOM_SEED = 1; - /** Template file that contains directives for generation of entries. */ private TemplateFile templateFile; @@ -69,7 +67,7 @@ public final class EntryGenerator implements EntryReader { private boolean isInitialized; /** Random seed is used to generate random data. */ - private int randomSeed = DEFAULT_RANDOM_SEED; + private Random random = new Random(); /** * Path to the directory that may contain additional resource files needed @@ -171,7 +169,7 @@ public EntryGenerator(final InputStream templateStream) { * @return A reference to this {@code EntryGenerator}. */ public EntryGenerator setRandomSeed(final int seed) { - randomSeed = seed; + random = new Random(seed); return this; } @@ -296,7 +294,7 @@ private void initialize() throws IOException { if (schema == null) { schema = Schema.getDefaultSchema(); } - templateFile = new TemplateFile(schema, constants, resourcePath, new Random(randomSeed), generateBranches); + templateFile = new TemplateFile(schema, constants, resourcePath, random, generateBranches); try { if (templatePath != null) { templateFile.parse(templatePath, warnings); From 055172d5af1f5ba6c704e014969714b964621c1e Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 8 Mar 2016 15:48:40 +0100 Subject: [PATCH 082/125] Fix typo in message --- .../main/resources/com/forgerock/opendj/ldap/core.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 77056c7f5..aabf612c9 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -1611,7 +1611,7 @@ WARN_ATTR_INVALID_PARTIAL_TIME_ASSERTION_FORMAT=The provided \ value "%s" could not be parsed as a valid assertion value because the \ character '%c' is not allowed. The acceptable values are s (second), \ m (minute), h (hour), D (date), M (month) and Y (year) -ERR_INVALID_COMPACTED_UNSIGNED_INT="Expected a compacted unsigned int (value less than %d), \ +ERR_INVALID_COMPACTED_UNSIGNED_INT=Expected a compacted unsigned int (value less than %d), \ but got a compacted unsigned long: %d ERR_TRANSACTION_ID_CONTROL_BAD_OID=Cannot decode the provided \ control as a transaction id control because it contained the OID '%s', \ From f435132f9d04158c31a799a788069c8ca3266c75 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Wed, 9 Mar 2016 17:49:03 +0100 Subject: [PATCH 083/125] Minor makeldif fixes * Prints a correct line number in warning/error messages The line number variable is used to access the lines array so the first line number is 0. It's misleading for UI messages beacause file editors usually starts with line 1. * Do not try to replace constants on a commented line * Improve makeldif error messages readability --- .../forgerock/opendj/ldif/TemplateFile.java | 47 ++++++++++--------- .../com/forgerock/opendj/ldap/core.properties | 6 +-- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java index 28113c514..6dd3d11cf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java @@ -425,8 +425,13 @@ void parse(final String[] lines, final List warnings) throws TemplateData templateData = new TemplateData(); for (int lineNumber = 0; lineNumber < lines.length; lineNumber++) { - final String line = replaceConstants(lines[lineNumber], lineNumber, constants, warnings); + final String currentRawLine = lines[lineNumber]; + if (currentRawLine.isEmpty() || currentRawLine.startsWith("#")) { + // This is a comment or a blank line, so we'll ignore it. + continue; + } + final String line = replaceConstants(currentRawLine, lineNumber, constants, warnings); final String lowerLine = line.toLowerCase(); if (line.length() == 0 || line.startsWith("#")) { // This is a comment or a blank line, so we'll ignore it. @@ -441,7 +446,7 @@ void parse(final String[] lines, final List warnings) throws lineNumber = parseTemplate(lineNumber, line, lines, templateData, warnings); } else { throw DecodeException.fatalError( - ERR_ENTRY_GENERATOR_UNEXPECTED_TEMPLATE_FILE_LINE.get(line, lineNumber)); + ERR_ENTRY_GENERATOR_UNEXPECTED_TEMPLATE_FILE_LINE.get(line, lineNumber + 1)); } } @@ -506,17 +511,17 @@ private void parseDefine(final int lineNumber, final String line, final Map= 0) { @@ -676,8 +681,8 @@ private Branch parseBranchDefinition(final String[] branchLines, final int start try { branchDN = DN.valueOf(dnString, schema); } catch (Exception e) { - throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_CANNOT_DECODE_BRANCH_DN.get( - dnString, startLineNumber)); + throw DecodeException.fatalError( + ERR_ENTRY_GENERATOR_CANNOT_DECODE_BRANCH_DN.get(dnString, startLineNumber + 1)); } final Branch branch = new Branch(this, branchDN, schema); @@ -751,7 +756,7 @@ private Template parseTemplateDefinition(final int startLineNumber, final String parentTemplate = definedTemplates.get(parentTemplateName.toLowerCase()); if (parentTemplate == null) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_TEMPLATE_INVALID_PARENT_TEMPLATE.get( - parentTemplateName, lineNumber, templateName)); + parentTemplateName, lineNumber + 1, templateName)); } } else if (lowerLine.startsWith(RDNATTR_LABEL)) { // This is the set of RDN attributes. If there are multiple, @@ -833,11 +838,11 @@ private Pair parseSubordinateTemplate(final int lineNumber, fin numEntries = Integer.parseInt(line.substring(colonPos + 1).trim()); if (numEntries == 0) { warnings.add(WARN_ENTRY_GENERATOR_SUBORDINATE_ZERO_ENTRIES.get( - lineNumber, element.getLabel(), elementName, templateName)); + lineNumber + 1, element.getLabel(), elementName, templateName)); } } catch (NumberFormatException nfe) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_SUBORDINATE_CANT_PARSE_NUMENTRIES.get( - templateName, lineNumber, element.getLabel(), elementName)); + templateName, lineNumber + 1, element.getLabel(), elementName)); } } @@ -882,10 +887,10 @@ private TemplateLine parseTemplateLine(final String line, final int lineNumber, final int colonPos = lowerLine.indexOf(':'); if (colonPos < 0) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_NO_COLON_IN_TEMPLATE_LINE.get( - lineNumber, element.getLabel(), elementName)); + lineNumber + 1, element.getLabel(), elementName)); } else if (colonPos == 0) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_NO_ATTR_IN_TEMPLATE_LINE.get( - lineNumber, element.getLabel(), elementName)); + lineNumber + 1, element.getLabel(), elementName)); } final AttributeType attributeType = schema.getAttributeType(lowerLine.substring(0, colonPos)); @@ -913,7 +918,7 @@ private TemplateLine parseTemplateLine(final String line, final int lineNumber, // We've hit the end of the line with no value. // We'll allow it, but add a warning. warnings.add(WARN_ENTRY_GENERATOR_NO_VALUE_IN_TEMPLATE_LINE.get( - lineNumber, element.getLabel(), elementName)); + lineNumber + 1, element.getLabel(), elementName)); } int phase = PARSING_STATIC_TEXT; @@ -1011,7 +1016,7 @@ private TemplateLine parseTemplateLine(final String line, final int lineNumber, tagList.add(t); } } else { - throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_INCOMPLETE_TAG.get(lineNumber)); + throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_INCOMPLETE_TAG.get(lineNumber + 1)); } return new TemplateLine(attributeType, lineNumber, tagList, valueIsURL, valueIsBase64); @@ -1053,7 +1058,7 @@ private TemplateTag parseReplacementTag(final String tagString, final Branch bra if (tag == null) { tag = tags.get(lowerTagName); if (tag == null) { - throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_NO_SUCH_TAG.get(tagName, lineNumber)); + throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_NO_SUCH_TAG.get(tagName, lineNumber + 1)); } } @@ -1068,7 +1073,7 @@ private TemplateTag parseReplacementTag(final String tagString, final Branch bra newTag = tag.getClass().newInstance(); } catch (Exception e) { throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_CANNOT_INSTANTIATE_NEW_TAG.get( - tagName, lineNumber, String.valueOf(e)), e); + tagName, lineNumber + 1, String.valueOf(e)), e); } if (branch == null) { @@ -1076,8 +1081,8 @@ private TemplateTag parseReplacementTag(final String tagString, final Branch bra } else if (newTag.allowedInBranch()) { newTag.initializeForBranch(schema, this, branch, arguments, lineNumber, warnings); } else { - throw DecodeException.fatalError(ERR_ENTRY_GENERATOR_TAG_NOT_ALLOWED_IN_BRANCH.get(newTag.getName(), - lineNumber)); + throw DecodeException.fatalError( + ERR_ENTRY_GENERATOR_TAG_NOT_ALLOWED_IN_BRANCH.get(newTag.getName(), lineNumber + 1)); } return newTag; } diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index aabf612c9..27d3ed870 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -1475,14 +1475,14 @@ ERR_ENTRY_GENERATOR_CONFLICTING_TAG_NAME=Cannot register the tag defined in \ class %s because the tag name %s conflicts with the name of another tag that \ has already been registered WARN_ENTRY_GENERATOR_WARNING_UNDEFINED_CONSTANT=Possible reference to an \ - undefined constant %s on line %d + undefined constant '%s' on line %d ERR_ENTRY_GENERATOR_DEFINE_MISSING_EQUALS=The constant definition on line \ %d is missing an equal sign to delimit the constant name from the value ERR_ENTRY_GENERATOR_DEFINE_NAME_EMPTY=The constant definition on line %d \ does not include a name for the constant -ERR_ENTRY_GENERATOR_WARNING_DEFINE_VALUE_EMPTY=Constant %s defined on line \ +ERR_ENTRY_GENERATOR_WARNING_DEFINE_VALUE_EMPTY=Constant '%s' defined on line \ %d has not been assigned a value -ERR_ENTRY_GENERATOR_CONFLICTING_BRANCH_DN=The branch definition %s starting \ +ERR_ENTRY_GENERATOR_CONFLICTING_BRANCH_DN=The branch definition '%s' starting \ on line %d conflicts with an earlier branch definition contained in the \ template file ERR_ENTRY_GENERATOR_CONFLICTING_TEMPLATE_NAME=The template definition %s \ From 576ec07d99668c1c3cae0c3358fdbddd359679a1 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Wed, 9 Mar 2016 19:06:09 +0100 Subject: [PATCH 084/125] Clean sdk-bom pom.xml Move build related sections (build, reporting and profiles) from opendj-sdk-bom/pom.xml to opendj-sdk-parent/pom.xml --- opendj-sdk-parent/pom.xml | 90 +++++++++++++++++++++++++++++++++++ pom.xml | 98 --------------------------------------- 2 files changed, 90 insertions(+), 98 deletions(-) diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index f739537f9..c0e2c8aef 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -290,6 +290,24 @@ + + org.forgerock.opendj + opendj-copyright-maven-plugin + ${project.version} + + + + README + **/README + README.txt + **/README.txt + **/THIRDPARTYREADME.txt + legal-notices/CDDLv1_0.txt + **/tests/unit-tests-testng/resource/config-changes.ldif + + + + org.forgerock.commons @@ -305,4 +323,76 @@ + + + + precommit + + + + org.forgerock.opendj + opendj-copyright-maven-plugin + + + check-copyright + + check-copyright + + + + + + + + + + update-copyrights + + + + org.forgerock.opendj + opendj-copyright-maven-plugin + + + check-copyright + none + + check-copyright + + + + update-copyright + + update-copyright + + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + + index + mailing-list + issue-tracking + license + scm + cim + distribution-management + + + + + + diff --git a/pom.xml b/pom.xml index d4c9331d4..d9bef6034 100644 --- a/pom.xml +++ b/pom.xml @@ -204,102 +204,4 @@ - - - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - ${project.version} - - - - README - **/README - README.txt - **/README.txt - **/THIRDPARTYREADME.txt - legal-notices/CDDLv1_0.txt - **/tests/unit-tests-testng/resource/config-changes.ldif - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - - - index - mailing-list - issue-tracking - license - scm - cim - distribution-management - - - - - - - - - - precommit - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - ${project.version} - - - check-copyright - - check-copyright - - - - - - - - - - update-copyrights - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - ${project.version} - - - check-copyright - none - - check-copyright - - - - update-copyright - - update-copyright - - - - - - - - From 89a760427e60bfac9736546877caf798a697d631 Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Wed, 9 Mar 2016 19:09:39 +0100 Subject: [PATCH 085/125] OPENDJSDK-88 Use opendj-copyright-maven-plugin:1.0.0 Since the plugin has been moved, it's first version has been released. Make the build more stable by using 1.0.0 released version --- opendj-sdk-parent/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index c0e2c8aef..27b63c924 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -60,6 +60,7 @@ ${opendj.osgi.import.additional}, * + 1.0.0 @@ -293,7 +294,7 @@ org.forgerock.opendj opendj-copyright-maven-plugin - ${project.version} + ${opendj-copyright-maven-plugin.version} From deeb0c1f8e36ec18b6cd23fa4c218441aa09690d Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Fri, 11 Mar 2016 12:36:52 +0100 Subject: [PATCH 086/125] Code cleanup in pom files Do not meld reactor pom (opendj-sdk-bom) which should be used to declare module to be build and parent pom. The only effective difference introduced by this change in the build process is that the following command: `cd opendj-sdk-parent && mvn clean install` will only build opendj-sdk-parent module instead of all opendj-sdk modules before. Thanks to Guillaume for the tip. --- opendj-sdk-parent/pom.xml | 11 ----------- pom.xml | 7 +++++++ 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml index 27b63c924..e77ffd2d0 100644 --- a/opendj-sdk-parent/pom.xml +++ b/opendj-sdk-parent/pom.xml @@ -33,17 +33,6 @@ This group module provides a complete LDAP SDK for developing LDAP Directory client and server applications. - - - ../opendj-doc-maven-plugin - ../opendj-core - ../opendj-grizzly - ../opendj-cli - ../opendj-ldap-toolkit - ../opendj-ldap-sdk-examples - ../opendj-rest2ldap - - 1.0.2 3.1.0 diff --git a/pom.xml b/pom.xml index d9bef6034..544695c5a 100644 --- a/pom.xml +++ b/pom.xml @@ -135,6 +135,13 @@ opendj-sdk-parent + opendj-doc-maven-plugin + opendj-core + opendj-grizzly + opendj-cli + opendj-ldap-toolkit + opendj-ldap-sdk-examples + opendj-rest2ldap From 89034b2b05baccde2ad1975b1c61941606d3acc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 14 Mar 2016 17:09:04 +0100 Subject: [PATCH 087/125] AttributeType.java: deprecate method temporarily added for OPENDJ-1632 --- .../java/org/forgerock/opendj/ldap/schema/AttributeType.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java index bd5b07be5..1843236ef 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java @@ -14,7 +14,6 @@ * Copyright 2009 Sun Microsystems, Inc. * Portions copyright 2011-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap.schema; import static java.util.Arrays.*; @@ -590,7 +589,10 @@ public String getNameOrOID() { * If it does not have any names, then the lower case OID will be returned. * * @return The normalized name or OID for this schema definition. + * @deprecated This method may be removed at any time + * @since OPENDJ-1632 Migrate AttributeType in one shot */ + @Deprecated public String getNormalizedNameOrOID() { return normalizedName; } From c0585e685faa2eed039af098c936b421f5156a7f Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Mon, 14 Mar 2016 18:45:29 +0100 Subject: [PATCH 088/125] Minor cleanup: invert parent pom and bom location in file-system In order to have a more concise BOM, relocate it to a sub-module and move the parent POM to the parent directory. Logically, the BOM is still the parent of the parent POM, but it now no longer needs to include project management related information such as license, scm, repositories, etc. (manually reviewed by Gaetan) --- opendj-cli/pom.xml | 4 +- opendj-core/pom.xml | 1 - opendj-doc-maven-plugin/pom.xml | 3 +- opendj-grizzly/pom.xml | 3 +- opendj-ldap-sdk-examples/pom.xml | 3 +- opendj-ldap-toolkit/pom.xml | 1 - opendj-rest2ldap/pom.xml | 7 +- opendj-sdk-bom/pom.xml | 101 ++++++++ opendj-sdk-parent/pom.xml | 388 ------------------------------ pom.xml | 401 ++++++++++++++++++++++++++----- 10 files changed, 453 insertions(+), 459 deletions(-) create mode 100644 opendj-sdk-bom/pom.xml delete mode 100644 opendj-sdk-parent/pom.xml diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index a087660ba..cc2362ff9 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -12,7 +12,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - Copyright 2014-2015 ForgeRock AS. + Copyright 2014-2016 ForgeRock AS. --> 4.0.0 @@ -21,8 +21,8 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml + opendj-cli OpenDJ CLI API This module includes CLI API for implementing CLI applications. diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index fef52fa51..13077c4e2 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-core diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index 1909e37f9..b60c44f15 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -12,7 +12,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - Copyright 2015 ForgeRock AS. + Copyright 2015-2016 ForgeRock AS. --> 4.0.0 @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-doc-maven-plugin diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml index df273d219..d684b16ce 100644 --- a/opendj-grizzly/pom.xml +++ b/opendj-grizzly/pom.xml @@ -12,7 +12,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - Copyright 2013-2015 ForgeRock AS. + Copyright 2013-2016 ForgeRock AS. --> 4.0.0 @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-grizzly diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index 880bb4c51..661de1ae2 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -12,7 +12,7 @@ Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - Copyright 2011-2015 ForgeRock AS. + Copyright 2011-2016 ForgeRock AS. --> 4.0.0 @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-ldap-sdk-examples diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index 0f53ae3d3..b364e2111 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-ldap-toolkit diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 43490d917..4bcce5ec6 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -3,15 +3,15 @@ The contents of this file are subject to the terms of the Common Development and Distribution License (the License). You may not use this file except in compliance with the License. - + You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the specific language governing permission and limitations under the License. - + When distributing Covered Software, include this CDDL Header Notice in each file and include the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL Header, with the fields enclosed by brackets [] replaced by your own identifying information: "Portions Copyright [year] [name of copyright owner]". - + Copyright 2012-2016 ForgeRock AS. --> @@ -21,7 +21,6 @@ opendj-sdk-parent org.forgerock.opendj 4.0.0-SNAPSHOT - ../opendj-sdk-parent/pom.xml opendj-rest2ldap diff --git a/opendj-sdk-bom/pom.xml b/opendj-sdk-bom/pom.xml new file mode 100644 index 000000000..b4df69b56 --- /dev/null +++ b/opendj-sdk-bom/pom.xml @@ -0,0 +1,101 @@ + + + + 4.0.0 + + + org.forgerock + forgerock-parent + 2.0.3 + + + + org.forgerock.opendj + opendj-sdk-bom + 4.0.0-SNAPSHOT + + pom + + OpenDJ SDK BOM + + Provides a list of OpenDJ SDK dependencies which are known to be compatible with each other. + + + + 4.0.0-SNAPSHOT + 1.4.2 + + + + + + + org.forgerock.commons + forgerock-bom + 4.1.1 + import + pom + + + + + org.forgerock.commons + i18n-core + ${i18n-framework.version} + + + + org.forgerock.commons + i18n-slf4j + ${i18n-framework.version} + + + + + + org.forgerock.opendj + opendj-core + ${opendj.sdk.version} + + + + org.forgerock.opendj + opendj-cli + ${opendj.sdk.version} + + + + org.forgerock.opendj + opendj-grizzly + ${opendj.sdk.version} + + + + org.forgerock.opendj + opendj-rest2ldap + ${opendj.sdk.version} + + + + + com.github.stephenc.jcip + jcip-annotations + 1.0-1 + + + + diff --git a/opendj-sdk-parent/pom.xml b/opendj-sdk-parent/pom.xml deleted file mode 100644 index e77ffd2d0..000000000 --- a/opendj-sdk-parent/pom.xml +++ /dev/null @@ -1,388 +0,0 @@ - - - - 4.0.0 - - - org.forgerock.opendj - opendj-sdk-bom - 4.0.0-SNAPSHOT - - - org.forgerock.opendj - opendj-sdk-parent - - pom - - OpenDJ SDK Parent - - This group module provides a complete LDAP SDK for developing LDAP Directory client and server applications. - - - - 1.0.2 - 3.1.0 - 2.3.23 - 3.1.2 - - - - - - ${opendj.osgi.import.additional}, - * - - 1.0.0 - - - - - - - io.dropwizard.metrics - metrics-core - ${metrics-core.version} - - - - - org.forgerock - forgerock-build-tools - ${forgerock-build-tools.version} - test - - - - - org.forgerock.opendj - opendj-core - test-jar - ${project.version} - test - - - - - - - - org.easytesting - fest-assert - test - - - - org.assertj - assertj-core - test - - - - org.mockito - mockito-all - test - - - - org.testng - testng - test - - - - org.slf4j - slf4j-jdk14 - test - - - - - - - - org.forgerock.maven.plugins - javadoc-updater-maven-plugin - 1.0.0 - - - site - - fixjavadoc - - - ${project.reporting.outputDirectory} - - - - - - - - - - org.forgerock.opendj - opendj-doc-maven-plugin - ${project.version} - - - - true - org.apache.maven.plugins - maven-compiler-plugin - - 1.7 - 1.7 - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -server - - - usedefaultlisteners - false - - - listener - org.forgerock.testng.ForgeRockTestListener - - - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.4 - - - generate-buildnumber - - create - - - buildRevision - -1 - - - - - - - org.apache.felix - maven-bundle-plugin - 2.3.7 - true - - - - <_removeheaders> - Bnd-LastModified,Built-By,Private-Package,Tool,Created-By,Build-Jdk,Include-Resource, - Ignore-Package,Private-Package,Bundle-DocURL - - ${opendj.osgi.import} - - - false - true - ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - http://commons.forgerock.org/i18n-framework/i18n-core/apidocs - - - - - - org.apache.maven.plugins - maven-source-plugin - - - - jar - - - - - - - org.apache.maven.plugins - maven-site-plugin - - en - - - - - org.forgerock.commons - i18n-maven-plugin - ${i18n-framework.version} - - - - org.codehaus.mojo - cobertura-maven-plugin - - - - **/*Messages.class - - - - - - - - org.apache.maven.plugins - maven-plugin-plugin - 3.2 - - true - - - - mojo-descriptor - process-classes - - descriptor - - - - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - ${opendj-copyright-maven-plugin.version} - - - - README - **/README - README.txt - **/README.txt - **/THIRDPARTYREADME.txt - legal-notices/CDDLv1_0.txt - **/tests/unit-tests-testng/resource/config-changes.ldif - - - - - - - org.forgerock.commons - forgerock-doc-maven-plugin - ${forgerock-doc-plugin.version} - - OpenDJ - ${project.version} - ${project.version} - UA-23412190-8 - - - - - - - - - precommit - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - - - check-copyright - - check-copyright - - - - - - - - - - update-copyrights - - - - org.forgerock.opendj - opendj-copyright-maven-plugin - - - check-copyright - none - - check-copyright - - - - update-copyright - - update-copyright - - - - - - - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.4 - - - - index - mailing-list - issue-tracking - license - scm - cim - distribution-management - - - - - - - diff --git a/pom.xml b/pom.xml index 544695c5a..8bb3cfe47 100644 --- a/pom.xml +++ b/pom.xml @@ -15,25 +15,23 @@ Copyright 2015-2016 ForgeRock AS. --> - - org.forgerock - forgerock-parent - 2.0.3 - - 4.0.0 - org.forgerock.opendj - opendj-sdk-bom - 4.0.0-SNAPSHOT + + org.forgerock.opendj + opendj-sdk-bom + 4.0.0-SNAPSHOT + opendj-sdk-bom/pom.xml + + opendj-sdk-parent pom - OpenDJ SDK BOM - OpenDJ BOM. - Provides a list of OpenDJ dependencies - which are known to be compatible with each other. + OpenDJ SDK Parent + + This group module provides a complete LDAP SDK for developing LDAP Directory client and server applications. + 2011 http://opendj.forgerock.org @@ -134,7 +132,7 @@ - opendj-sdk-parent + opendj-sdk-bom opendj-doc-maven-plugin opendj-core opendj-grizzly @@ -149,66 +147,355 @@ scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs - 4.0.0-SNAPSHOT - 1.4.2 + 1.0.2 + 3.1.0 + 2.3.23 + 3.1.2 + + + + + + ${opendj.osgi.import.additional}, + * + + 1.0.0 - - - org.forgerock.commons - forgerock-bom - 4.1.1 - import - pom - - - + - org.forgerock.commons - i18n-core - ${i18n-framework.version} + io.dropwizard.metrics + metrics-core + ${metrics-core.version} + - org.forgerock.commons - i18n-slf4j - ${i18n-framework.version} + org.forgerock + forgerock-build-tools + ${forgerock-build-tools.version} + test - org.forgerock.opendj opendj-core - ${opendj.sdk.version} + test-jar + ${project.version} + test + + - - org.forgerock.opendj - opendj-cli - ${opendj.sdk.version} - - - org.forgerock.opendj - opendj-grizzly - ${opendj.sdk.version} - + + + org.easytesting + fest-assert + test + - - org.forgerock.opendj - opendj-rest2ldap - ${opendj.sdk.version} - + + org.assertj + assertj-core + test + - - - com.github.stephenc.jcip - jcip-annotations - 1.0-1 - - - + + org.mockito + mockito-all + test + + + + org.testng + testng + test + + + + org.slf4j + slf4j-jdk14 + test + + + + + + + + org.forgerock.maven.plugins + javadoc-updater-maven-plugin + 1.0.0 + + + site + + fixjavadoc + + + ${project.reporting.outputDirectory} + + + + + + + + + + org.forgerock.opendj + opendj-doc-maven-plugin + ${project.version} + + + + true + org.apache.maven.plugins + maven-compiler-plugin + + 1.7 + 1.7 + + + + + org.apache.maven.plugins + maven-surefire-plugin + + -server + + + usedefaultlisteners + false + + + listener + org.forgerock.testng.ForgeRockTestListener + + + + + + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + generate-buildnumber + + create + + + buildRevision + -1 + + + + + + + org.apache.felix + maven-bundle-plugin + 2.3.7 + true + + + + <_removeheaders> + Bnd-LastModified,Built-By,Private-Package,Tool,Created-By,Build-Jdk,Include-Resource, + Ignore-Package,Private-Package,Bundle-DocURL + + ${opendj.osgi.import} + + + false + true + ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + http://commons.forgerock.org/i18n-framework/i18n-core/apidocs + + + + + + org.apache.maven.plugins + maven-source-plugin + + + + jar + + + + + + + org.apache.maven.plugins + maven-site-plugin + + en + + + + + org.forgerock.commons + i18n-maven-plugin + ${i18n-framework.version} + + + + org.codehaus.mojo + cobertura-maven-plugin + + + + **/*Messages.class + + + + + + + + org.apache.maven.plugins + maven-plugin-plugin + 3.2 + + true + + + + mojo-descriptor + process-classes + + descriptor + + + + + + + org.forgerock.opendj + opendj-copyright-maven-plugin + ${opendj-copyright-maven-plugin.version} + + + + README + **/README + README.txt + **/README.txt + **/THIRDPARTYREADME.txt + legal-notices/CDDLv1_0.txt + **/tests/unit-tests-testng/resource/config-changes.ldif + + + + + + + org.forgerock.commons + forgerock-doc-maven-plugin + ${forgerock-doc-plugin.version} + + OpenDJ + ${project.version} + ${project.version} + UA-23412190-8 + + + + + + + + + precommit + + + + org.forgerock.opendj + opendj-copyright-maven-plugin + + + check-copyright + + check-copyright + + + + + + + + + + update-copyrights + + + + org.forgerock.opendj + opendj-copyright-maven-plugin + + + check-copyright + none + + check-copyright + + + + update-copyright + + update-copyright + + + + + + + + + + + + + org.apache.maven.plugins + maven-project-info-reports-plugin + 2.4 + + + + index + mailing-list + issue-tracking + license + scm + cim + distribution-management + + + + + + From 7cc8f427a8d0489db7811e8c09680ba3df4f4f0c Mon Sep 17 00:00:00 2001 From: Gaetan Boismal Date: Tue, 15 Mar 2016 10:26:38 +0100 Subject: [PATCH 089/125] Code cleanup in toolkit bat library Remove unreachable code paths from toolkit _script-util.bat --- .../src/main/assembly/libbat/_script-util.bat | 48 +------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat b/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat index 351c7620e..1a612a92f 100644 --- a/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat +++ b/opendj-ldap-toolkit/src/main/assembly/libbat/_script-util.bat @@ -12,7 +12,7 @@ rem Header, with the fields enclosed by brackets [] replaced by your own identif rem information: "Portions Copyright [year] [name of copyright owner]". rem rem Copyright 2008-2009 Sun Microsystems, Inc. -rem Portions copyright 2013-2015 ForgeRock AS. +rem Portions copyright 2013-2016 ForgeRock AS. set SET_JAVA_HOME_AND_ARGS_DONE=false set SET_ENVIRONMENT_VARS_DONE=false @@ -64,7 +64,6 @@ if "%SET_CLASSPATH_DONE%" == "false" goto setClassPath if "%SET_ENVIRONMENT_VARS_DONE%" == "false" goto setEnvironmentVars goto testJava - :setJavaHomeAndArgs if "%SET_JAVA_HOME_AND_ARGS_DONE%" == "true" goto prepareCheck if not exist "%INSTANCE_ROOT%\lib\set-java-home.bat" goto checkEnvJavaArgs @@ -126,51 +125,6 @@ set SCRIPT_NAME_ARG=-Dcom.forgerock.opendj.ldap.tools.scriptName=%SCRIPT_NAME% set SET_ENVIRONMENT_VARS_DONE=true goto scriptBegin -:noValidJavaHome -if NOT "%OPENDJ_JAVA_ARGS%" == "" goto noValidHomeWithArgs -echo ERROR: The detected Java version could not be used. The detected -echo Java binary is: -echo %OPENDJ_JAVA_BIN% -echo You must specify the path to a valid Java 5.0 or higher version. -echo The procedure to follow is: -echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists. -echo 2. Set the environment variable OPENDJ_JAVA_HOME to the root of a valid -echo Java 5.0 installation. -echo If you want to have specific Java settings for each command line you must -echo follow the steps 3 and 4. -echo 3. Edit the properties file specifying the Java binary and the Java arguments -echo for each command line. The Java properties file is located in: -echo %INSTANCE_ROOT%\config\java.properties. -echo 4. Run the command-line %INSTALL_ROOT%\bat\dsjavaproperties.bat -pause -exit /B 1 - -:notSupportedJavaHome -rem We get here when the java version is 5 (or up) but not supported. We run -rem InstallDS again to see a localized message. -"%OPENDJ_JAVA_BIN%" %OPENDJ_JAVA_ARGS% org.opendj.server.tools.InstallDS --testonly -pause -exit /B 1 - -:noValidHomeWithArgs -echo ERROR: The detected Java version could not be used with the set of Java -echo arguments %OPENDJ_JAVA_ARGS%. -echo The detected Java binary is: -echo %OPENDJ_JAVA_BIN% -echo You must specify the path to a valid Java 5.0 or higher version. -echo The procedure to follow is: -echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists. -echo 2. Set the environment variable OPENDJ_JAVA_HOME to the root of a valid -echo Java 5.0 installation. -echo If you want to have specific Java settings for each command line you must -echo follow the steps 3 and 4. -echo 3. Edit the properties file specifying the Java binary and the Java arguments -echo for each command line. The Java properties file is located in: -echo %INSTANCE_ROOT%\config\java.properties. -echo 4. Run the command-line %INSTALL_ROOT%\bat\dsjavaproperties.bat -pause -exit /B 1 - :isVersionOrHelp if [%1] == [] goto end if [%1] == [--help] goto end From cb59366678306aae36fd04dc6cd379b47189a968 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 00:09:25 +0100 Subject: [PATCH 090/125] Minor code cleanup --- .../java/org/forgerock/opendj/ldap/AVA.java | 383 ++++++------------ .../java/org/forgerock/opendj/ldap/DN.java | 8 +- .../ConnectionChangeRecordWriterTestCase.java | 13 +- .../ldif/ConnectionEntryWriterTestCase.java | 11 +- .../opendj/ldap/tools/PerformanceRunner.java | 5 +- 5 files changed, 131 insertions(+), 289 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java index f02871a73..2f4d16763 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java @@ -144,7 +144,6 @@ static AVA decode(final SubstringReader reader, final Schema schema) { // Parse the value for this RDN component. final ByteString value = readAttributeValue(reader); - return new AVA(attribute, nameOrOid, value); } @@ -177,180 +176,29 @@ static void escapeAttributeValue(final String str, final StringBuilder builder) } } - private static void appendHexChars(final SubstringReader reader, - final StringBuilder valueBuffer, final StringBuilder hexBuffer) throws DecodeException { - final int length = hexBuffer.length(); - if (length == 0) { - return; - } - - if (length % 2 != 0) { - final LocalizableMessage message = ERR_HEX_DECODE_INVALID_LENGTH.get(hexBuffer); - throw DecodeException.error(message); - } - - int pos = 0; - final int arrayLength = length / 2; - final byte[] hexArray = new byte[arrayLength]; - for (int i = 0; i < arrayLength; i++) { - switch (hexBuffer.charAt(pos++)) { - case '0': - hexArray[i] = 0x00; - break; - case '1': - hexArray[i] = 0x10; - break; - case '2': - hexArray[i] = 0x20; - break; - case '3': - hexArray[i] = 0x30; - break; - case '4': - hexArray[i] = 0x40; - break; - case '5': - hexArray[i] = 0x50; - break; - case '6': - hexArray[i] = 0x60; - break; - case '7': - hexArray[i] = 0x70; - break; - case '8': - hexArray[i] = (byte) 0x80; - break; - case '9': - hexArray[i] = (byte) 0x90; - break; - case 'A': - case 'a': - hexArray[i] = (byte) 0xA0; - break; - case 'B': - case 'b': - hexArray[i] = (byte) 0xB0; - break; - case 'C': - case 'c': - hexArray[i] = (byte) 0xC0; - break; - case 'D': - case 'd': - hexArray[i] = (byte) 0xD0; - break; - case 'E': - case 'e': - hexArray[i] = (byte) 0xE0; - break; - case 'F': - case 'f': - hexArray[i] = (byte) 0xF0; - break; - default: - final LocalizableMessage message = - ERR_HEX_DECODE_INVALID_CHARACTER.get(hexBuffer, hexBuffer.charAt(pos - 1)); - throw DecodeException.error(message); - } - - switch (hexBuffer.charAt(pos++)) { - case '0': - // No action required. - break; - case '1': - hexArray[i] |= 0x01; - break; - case '2': - hexArray[i] |= 0x02; - break; - case '3': - hexArray[i] |= 0x03; - break; - case '4': - hexArray[i] |= 0x04; - break; - case '5': - hexArray[i] |= 0x05; - break; - case '6': - hexArray[i] |= 0x06; - break; - case '7': - hexArray[i] |= 0x07; - break; - case '8': - hexArray[i] |= 0x08; - break; - case '9': - hexArray[i] |= 0x09; - break; - case 'A': - case 'a': - hexArray[i] |= 0x0A; - break; - case 'B': - case 'b': - hexArray[i] |= 0x0B; - break; - case 'C': - case 'c': - hexArray[i] |= 0x0C; - break; - case 'D': - case 'd': - hexArray[i] |= 0x0D; - break; - case 'E': - case 'e': - hexArray[i] |= 0x0E; - break; - case 'F': - case 'f': - hexArray[i] |= 0x0F; - break; - default: - final LocalizableMessage message = - ERR_HEX_DECODE_INVALID_CHARACTER.get(hexBuffer, hexBuffer.charAt(pos - 1)); - throw DecodeException.error(message); - } - } - try { - valueBuffer.append(new String(hexArray, "UTF-8")); - } catch (final Exception e) { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), String - .valueOf(e)); - throw DecodeException.error(message); - } - // Clean up the hex buffer. - hexBuffer.setLength(0); - } - - private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) - throws DecodeException { - char c = '\u0000'; + private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) { final StringBuilder valueBuffer = new StringBuilder(); - final StringBuilder hexBuffer = new StringBuilder(); + StringBuilder hexBuffer = null; reader.skipWhitespaces(); boolean escaped = false; while (reader.remaining() > 0) { - c = reader.read(); + final char c = reader.read(); if (escaped) { // This character is escaped. if (isHexDigit(c)) { // Unicode characters. if (reader.remaining() <= 0) { - final LocalizableMessage msg = - ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID - .get(reader.getString()); - throw DecodeException.error(msg); + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); } // Check the next byte for hex. final char c2 = reader.read(); if (isHexDigit(c2)) { + if (hexBuffer == null) { + hexBuffer = new StringBuilder(); + } hexBuffer.append(c); hexBuffer.append(c2); // We may be at the end. @@ -358,24 +206,20 @@ private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) appendHexChars(reader, valueBuffer, hexBuffer); } } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID - .get(reader.getString()); - throw DecodeException.error(message); + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); } } else { appendHexChars(reader, valueBuffer, hexBuffer); valueBuffer.append(c); } escaped = false; - } else if (c == 0x5C /* The backslash character */) { - // We found an escape. + } else if (c == '\\') { escaped = true; } else { // Check for delimited chars. if (c == '+' || c == ',' || c == ';') { reader.reset(); - // Return what we have got here so far. appendHexChars(reader, valueBuffer, hexBuffer); return ByteString.valueOfUtf8(valueBuffer); } @@ -390,6 +234,23 @@ private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) return ByteString.valueOfUtf8(valueBuffer); } + private static void appendHexChars(final SubstringReader reader, + final StringBuilder valueBuffer, + final StringBuilder hexBuffer) { + if (hexBuffer == null) { + return; + } + final ByteString bytes = ByteString.valueOfHex(hexBuffer.toString()); + try { + valueBuffer.append(new String(bytes.toByteArray(), "UTF-8")); + } catch (final Exception e) { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), String.valueOf(e))); + } + // Clean up the hex buffer. + hexBuffer.setLength(0); + } + private static String readAttributeName(final SubstringReader reader) { int length = 1; reader.mark(); @@ -456,120 +317,114 @@ private static ByteString readAttributeValue(final SubstringReader reader) { return ByteString.empty(); } + // Decide how to parse based on the first character. reader.mark(); - - // Look at the first character. If it is an octothorpe (#), then - // that means that the value should be a hex string. char c = reader.read(); - int length = 0; if (c == '+') { - // Value is empty and followed by another AVA + // Value is empty and followed by another AVA. reader.reset(); return ByteString.empty(); } else if (c == '#') { - // The first two characters must be hex characters. - reader.mark(); - if (reader.remaining() < 2) { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(reader.getString()); - throw new LocalizedIllegalArgumentException(message); + // Value is HEX encoded BER. + return readAttributeValueAsBER(reader); + } else if (c == '"') { + // The value should continue until the corresponding closing quotation mark. + return readAttributeValueWithinQuotes(reader); + } else { + // Otherwise, use general parsing to find the end of the value. + return readAttributeValueUnescaped(reader); + } + } + + private static ByteString readAttributeValueUnescaped(final SubstringReader reader) { + reader.reset(); + final ByteString bytes = delimitAndEvaluateEscape(reader); + if (bytes.length() == 0) { + // We don't allow an empty attribute value. + final LocalizableMessage message = + ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(reader.getString(), reader.pos()); + throw new LocalizedIllegalArgumentException(message); + } + return bytes; + } + + private static ByteString readAttributeValueWithinQuotes(final SubstringReader reader) { + int length = 0; + reader.mark(); + while (true) { + if (reader.remaining() <= 0) { + // We hit the end of the AVA before the closing quote. That's an error. + throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(reader.getString())); } - for (int i = 0; i < 2; i++) { - c = reader.read(); - if (isHexDigit(c)) { - length++; - } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c); - throw new LocalizedIllegalArgumentException(message); - } + if (reader.read() == '"') { + // This is the end of the value. + break; } + length++; + } + reader.reset(); + final ByteString retString = ByteString.valueOfUtf8(reader.read(length)); + reader.read(); + return retString; + } - // The rest of the value must be a multiple of two hex - // characters. The end of the value may be designated by the - // end of the DN, a comma or semicolon, or a space. - while (reader.remaining() > 0) { - c = reader.read(); - if (isHexDigit(c)) { - length++; - - if (reader.remaining() > 0) { - c = reader.read(); - if (isHexDigit(c)) { - length++; - } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c); - throw new LocalizedIllegalArgumentException(message); - } + private static ByteString readAttributeValueAsBER(final SubstringReader reader) { + // The first two characters must be hex characters. + reader.mark(); + if (reader.remaining() < 2) { + throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(reader.getString())); + } + + int length = 0; + for (int i = 0; i < 2; i++) { + final char c = reader.read(); + if (isHexDigit(c)) { + length++; + } else { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c)); + } + } + + // The rest of the value must be a multiple of two hex + // characters. The end of the value may be designated by the + // end of the DN, a comma or semicolon, or a space. + while (reader.remaining() > 0) { + char c = reader.read(); + if (isHexDigit(c)) { + length++; + + if (reader.remaining() > 0) { + c = reader.read(); + if (isHexDigit(c)) { + length++; } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(reader.getString()); - throw new LocalizedIllegalArgumentException(message); + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c)); } - } else if (c == ' ' || c == ',' || c == ';') { - // This denotes the end of the value. - break; } else { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c); - throw new LocalizedIllegalArgumentException(message); + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_HEX_VALUE_TOO_SHORT.get(reader.getString())); } + } else if (c == ' ' || c == ',' || c == ';') { + // This denotes the end of the value. + break; + } else { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_INVALID_HEX_DIGIT.get(reader.getString(), c)); } + } - // At this point, we should have a valid hex string. Convert it - // to a byte array and set that as the value of the provided - // octet string. - try { - reader.reset(); - return ByteString.valueOfHex(reader.read(length)); - } catch (final LocalizedIllegalArgumentException e) { - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), e - .getMessageObject()); - throw new LocalizedIllegalArgumentException(message); - } - } else if (c == '"') { - // If the first character is a quotation mark, then the value - // should continue until the corresponding closing quotation mark. - reader.mark(); - while (true) { - if (reader.remaining() <= 0) { - // We hit the end of the AVA before the closing quote. - // That's an error. - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(reader.getString()); - throw new LocalizedIllegalArgumentException(message); - } - - if (reader.read() == '"') { - // This is the end of the value. - break; - } - length++; - } - reader.reset(); - final ByteString retString = ByteString.valueOfUtf8(reader.read(length)); - reader.read(); - return retString; - } else { - // Otherwise, use general parsing to find the end of the value. + // At this point, we should have a valid hex string. Convert it + // to a byte array and set that as the value of the provided + // octet string. + try { reader.reset(); - ByteString bytes; - try { - bytes = delimitAndEvaluateEscape(reader); - } catch (final DecodeException e) { - throw new LocalizedIllegalArgumentException(e.getMessageObject()); - } - if (bytes.length() == 0) { - // We don't allow an empty attribute value. - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(reader.getString(), - reader.pos()); - throw new LocalizedIllegalArgumentException(message); - } - return bytes; + return ByteString.valueOfHex(reader.read(length)); + } catch (final LocalizedIllegalArgumentException e) { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), e.getMessageObject())); } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index 87fcf9322..602c9716e 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -313,9 +313,7 @@ protected boolean removeEldestEntry(final Map.Entry e) { } private final RDN rdn; - private DN parent; - private final int size; /** @@ -881,8 +879,7 @@ public int size() { public String toString() { // We don't care about potential race conditions here. if (stringValue == null) { - final StringBuilder builder = new StringBuilder(); - rdn.toString(builder); + final StringBuilder builder = rdn.toString(new StringBuilder()); if (!parent.isRootDN()) { builder.append(RDN_CHAR_SEPARATOR); builder.append(parent); @@ -976,8 +973,9 @@ public UUID toUUID() { *
  • lazily: the normalized value is computed only the first time it is needed.
    • * * - * @Deprecated This class will eventually be replaced by a compact implementation of a DN. + * @deprecated This class will eventually be replaced by a compact implementation of a DN. */ + @Deprecated public static final class CompactDn implements Comparable { /** Original string corresponding to the DN. */ private final byte[] originalValue; diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java index 7255d5269..0dc42a54f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions Copyright 2012-2015 ForgeRock AS. + * Portions Copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -370,9 +370,7 @@ public final void testWriteCommentDoesntAllowNull() throws Exception { */ @Test(expectedExceptions = NullPointerException.class) public final void testConnectionChangeRecordWriterDoesntAllowNull() throws Exception { - try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(null)) { - // nothing more to do - } + new ConnectionChangeRecordWriter(null); } /** @@ -384,10 +382,7 @@ public final void testConnectionChangeRecordWriterDoesntAllowNull() throws Excep @Test public final void testConnectionChangeRecordWriterClose() throws Exception { Connection connection = mock(Connection.class); - try (ConnectionChangeRecordWriter writer = new ConnectionChangeRecordWriter(connection)) { - // nothing more to do - } finally { - verify(connection, times(1)).close(); - } + new ConnectionChangeRecordWriter(connection).close(); + verify(connection, times(1)).close(); } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java index 8a9181efe..f0502a5da 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java @@ -92,9 +92,7 @@ public final void testConnectionEntryWriterDoesntAllowNullComment() throws Excep */ @Test(expectedExceptions = NullPointerException.class) public final void testConnectionEntryWriterDoesntAllowNull() throws Exception { - try (ConnectionEntryWriter writer = new ConnectionEntryWriter(null)) { - // nothing to do - } + new ConnectionEntryWriter(null); } /** @@ -106,10 +104,7 @@ public final void testConnectionEntryWriterDoesntAllowNull() throws Exception { @Test public final void testConnectionEntryWriterClose() throws Exception { Connection connection = mock(Connection.class); - try (ConnectionEntryWriter writer = new ConnectionEntryWriter(connection)) { - // nothing to do - } finally { - verify(connection, times(1)).close(); - } + new ConnectionEntryWriter(connection).close(); + verify(connection, times(1)).close(); } } diff --git a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java index d1071e382..bd119ef22 100644 --- a/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java +++ b/opendj-ldap-toolkit/src/main/java/com/forgerock/opendj/ldap/tools/PerformanceRunner.java @@ -453,10 +453,9 @@ final int run(final ConnectionFactory connectionFactory) { return 0; } + // detects wrong bind parameters, server unreachable (server down, network problem?), etc. private void validateCanConnectToServer(ConnectionFactory connectionFactory) throws LdapException { - try (Connection c = connectionFactory.getConnection()) { - // detects wrong bind parameters, server unreachable (server down, network problem?), etc. - } + connectionFactory.getConnection().close(); } synchronized void stopTool() { From 1346b612b531d77fadbcee0140d39c81233b17b6 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 00:15:10 +0100 Subject: [PATCH 091/125] OPENDJ-2776 Remove trailing spaces from AVAs and RDNs during parsing Leading and trailing whitespace in RDN attribute values must be escaped according to RFC 4514, otherwise the RDN is invalid. However, it is often best practice to be tolerant of malformed data, so we should really trim off any leading or trailing whitespaces. The AVA class was already trimming leading whitespace, but not trailing. --- .../java/org/forgerock/opendj/ldap/AVA.java | 5 ++++ .../forgerock/opendj/ldap/AVATestCase.java | 28 +++++++++++++++++++ .../forgerock/opendj/ldap/RDNTestCase.java | 22 +++++++++++++-- 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java index 2f4d16763..599f28bab 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java @@ -182,6 +182,7 @@ private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) reader.skipWhitespaces(); boolean escaped = false; + int trailingSpaces = 0; while (reader.remaining() > 0) { final char c = reader.read(); if (escaped) { @@ -216,21 +217,25 @@ private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) escaped = false; } else if (c == '\\') { escaped = true; + trailingSpaces = 0; } else { // Check for delimited chars. if (c == '+' || c == ',' || c == ';') { reader.reset(); appendHexChars(reader, valueBuffer, hexBuffer); + valueBuffer.setLength(valueBuffer.length() - trailingSpaces); return ByteString.valueOfUtf8(valueBuffer); } // It is definitely not a delimiter at this point. appendHexChars(reader, valueBuffer, hexBuffer); valueBuffer.append(c); + trailingSpaces = c != ' ' ? 0 : trailingSpaces + 1; } reader.mark(); } reader.reset(); + valueBuffer.setLength(valueBuffer.length() - trailingSpaces); return ByteString.valueOfUtf8(valueBuffer); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java index 1c3993cb1..b7ac087a7 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java @@ -52,4 +52,32 @@ public void hexEncodingDoesNotLoseInformation() throws Exception { final String roundtrippedValue = AVA.valueOf(avaString).toString(); assertThat(AVA.valueOf(roundtrippedValue).toString()).isEqualTo(avaString); } + + @DataProvider + public Object[][] toStringShouldStripOutIllegalWhitespaceDataProvider() { + // @formatter:off + return new Object[][] { + { " dc = hello world ", "dc=hello world" }, + { " dc =\\ hello world\\ ", "dc=\\ hello world\\ " }, + }; + // @formatter:on + } + + @Test(dataProvider = "toStringShouldStripOutIllegalWhitespaceDataProvider") + public void toStringShouldStripOutIllegalWhitespace(String withWhiteSpace, String withoutWhiteSpace) { + assertThat(AVA.valueOf(withWhiteSpace).toString()).isEqualTo(withoutWhiteSpace); + assertThat(AVA.valueOf(withWhiteSpace).toNormalizedByteString(new ByteStringBuilder())) + .isEqualTo(AVA.valueOf(withoutWhiteSpace).toNormalizedByteString(new ByteStringBuilder())); + } + + @Test + public void avaConstructedWithValueContainingLeadingAndTrailingSpacesShouldBeEscaped() { + AVA ava = new AVA("dc", " hello world "); + assertThat(ava.toString()).isEqualTo("dc=\\ hello world\\ "); + } + + @Test + public void valueOfDecodesTrailingEscapedChars() { + assertThat(AVA.valueOf("dc=\\41\\42\\43").toString()).isEqualTo("dc=ABC"); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java index 26fdd6953..3d59411a4 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java @@ -12,12 +12,12 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2011-2015 ForgeRock AS. + * Portions copyright 2011-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; -import static org.fest.assertions.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; @@ -449,4 +449,22 @@ public void testHashCode(final Object first, final Object second, final int resu .isNotEqualTo(h2); } } + + @DataProvider + public Object[][] toStringShouldStripOutIllegalWhitespaceDataProvider() { + // @formatter:off + return new Object[][] { + { " dc = hello world ", "dc=hello world" }, + { " dc =\\ hello world\\ ", "dc=\\ hello world\\ " }, + { " uid = cpfc + dc = example ", "uid=cpfc+dc=example" }, + }; + // @formatter:on + } + + @Test(dataProvider = "toStringShouldStripOutIllegalWhitespaceDataProvider") + public void toStringShouldStripOutIllegalWhitespace(String withWhiteSpace, String withoutWhiteSpace) { + assertThat(RDN.valueOf(withWhiteSpace).toString()).isEqualTo(withoutWhiteSpace); + assertThat(RDN.valueOf(withWhiteSpace).toNormalizedByteString(new ByteStringBuilder())) + .isEqualTo(RDN.valueOf(withoutWhiteSpace).toNormalizedByteString(new ByteStringBuilder())); + } } From e3e9325161c472653aa2493339393978fe6e5bb6 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 01:17:35 +0100 Subject: [PATCH 092/125] OPENDJ-2776 Remove insignificant/illegal whitespace during parsing of DNs Strictly speaking RFC 4514 does not allow whitespace before or after RDN or AVA separators. Whilst it is often good practice to be tolerant of malformed input, we should not produce it. The DN class was tolerating whitespace characters around the RDN and AVA separators, but was not removing them, causing the toString() method to product an invalid string representation. This change provides a simple fix: do not cache the user provided string, but instead regenerate it lazily when toString() is called. Whilst the fix is simple it does incur a slight performance penalty in the common case where the input DN string is valid. --- .../java/org/forgerock/opendj/ldap/DN.java | 35 ++++++++----------- .../org/forgerock/opendj/ldap/DNTestCase.java | 20 +++++++++++ .../ldif/LDIFChangeRecordReaderTestCase.java | 32 ++++++----------- .../ldif/LDIFChangeRecordWriterTestCase.java | 5 ++- .../opendj/ldif/LDIFEntryReaderTestCase.java | 22 +++++------- 5 files changed, 56 insertions(+), 58 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index 602c9716e..ad247e045 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -60,7 +60,7 @@ public final class DN implements Iterable, Comparable { static final char RDN_CHAR_SEPARATOR = ','; static final char AVA_CHAR_SEPARATOR = '+'; - private static final DN ROOT_DN = new DN(CoreSchema.getInstance(), null, null, ""); + private static final DN ROOT_DN = new DN(CoreSchema.getInstance(), null, null); /** * This is the size of the per-thread per-schema DN cache. We should @@ -238,8 +238,7 @@ public static DN valueOf(final String dn, final Schema schema) { } // Not in cache so decode. - final SubstringReader reader = new SubstringReader(dn); - return decode(dn, reader, schema, cache); + return decode(new SubstringReader(dn), schema, cache); } /** @@ -258,8 +257,7 @@ public static DN valueOf(ByteString dn) { } /** Decodes a DN using the provided reader and schema. */ - private static DN decode(final String dnString, final SubstringReader reader, - final Schema schema, final Map cache) { + private static DN decode(final SubstringReader reader, final Schema schema, final Map cache) { reader.skipWhitespaces(); if (reader.remaining() == 0) { return ROOT_DN; @@ -282,7 +280,7 @@ private static DN decode(final String dnString, final SubstringReader reader, parent = cache.get(parentString); if (parent == null) { reader.reset(); - parent = decode(parentString, reader, schema, cache); + parent = decode(reader, schema, cache); // Only cache parent DNs since leaf DNs are likely to make the // cache to volatile. @@ -292,7 +290,7 @@ private static DN decode(final String dnString, final SubstringReader reader, parent = ROOT_DN; } - return new DN(schema, parent, rdn, dnString); + return new DN(schema, parent, rdn); } @SuppressWarnings("serial") @@ -322,27 +320,24 @@ protected boolean removeEldestEntry(final Map.Entry e) { */ private ByteString normalizedDN; - /** - * We need to store the original string value if provided in order to - * preserve the original whitespace. - */ + /** The RFC 4514 string representation of this DN. */ private String stringValue; /** The schema used to create this DN. */ private final Schema schema; /** Private constructor. */ - private DN(final Schema schema, final DN parent, final RDN rdn, final String stringValue) { - this(schema, parent, rdn, stringValue, parent != null ? parent.size + 1 : 0); + private DN(final Schema schema, final DN parent, final RDN rdn) { + this(schema, parent, rdn, parent != null ? parent.size + 1 : 0); } /** Private constructor. */ - private DN(final Schema schema, final DN parent, final RDN rdn, final String stringValue, final int size) { + private DN(final Schema schema, final DN parent, final RDN rdn, final int size) { this.schema = schema; this.parent = parent; this.rdn = rdn; - this.stringValue = stringValue; this.size = size; + this.stringValue = rdn == null ? "" : null; // Compute lazily. } /** @@ -370,7 +365,7 @@ public DN child(final DN dn) { } DN newDN = this; for (i = 0; i < rdns.length; i++) { - newDN = new DN(this.schema, newDN, rdns[i], null); + newDN = new DN(this.schema, newDN, rdns[i]); } return newDN; } @@ -394,7 +389,7 @@ public DN child(final DN dn) { */ public DN child(final RDN rdn) { Reject.ifNull(rdn); - return new DN(this.schema, this, rdn, null); + return new DN(this.schema, this, rdn); } /** @@ -741,11 +736,11 @@ public DN localName(final int index) { } else if (index >= size) { return this; } else { - final DN localName = new DN(this.schema, null, rdn, null, index); + final DN localName = new DN(this.schema, null, rdn, index); DN nextLocalName = localName; DN lastDN = parent; for (int i = index - 1; i > 0; i--) { - nextLocalName.parent = new DN(this.schema, null, lastDN.rdn, null, i); + nextLocalName.parent = new DN(this.schema, null, lastDN.rdn, i); nextLocalName = nextLocalName.parent; lastDN = lastDN.parent; } @@ -989,7 +984,7 @@ public static final class CompactDn implements Comparable { private final Schema schema; private CompactDn(final DN dn) { - this.originalValue = dn.stringValue != null ? getBytes(dn.stringValue) : new byte[0]; + this.originalValue = getBytes(dn.toString()); this.schema = dn.schema; } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java index c49724567..816669737 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java @@ -1246,4 +1246,24 @@ public void toUUID() { UUID uuid2 = DN.valueOf("cn=test+dc=example,dc=com").toUUID(); assertEquals(uuid1, uuid2); } + + @DataProvider + public Object[][] toStringShouldStripOutIllegalWhitespaceDataProvider() { + // @formatter:off + return new Object[][] { + { " ", "" }, + { " dc = hello world ", "dc=hello world" }, + { " dc =\\ hello world\\ ", "dc=\\ hello world\\ " }, + { " dc = example , dc = com ", "dc=example,dc=com" }, + { " uid = crystal + dc = example , uid = palace + dc = com ", "uid=crystal+dc=example,uid=palace+dc=com" }, + }; + // @formatter:on + } + + @Test(dataProvider = "toStringShouldStripOutIllegalWhitespaceDataProvider") + public void toStringShouldStripOutIllegalWhitespace(String withWhiteSpace, String withoutWhiteSpace) { + assertThat(DN.valueOf(withWhiteSpace).toString()).isEqualTo(withoutWhiteSpace); + assertThat(DN.valueOf(withWhiteSpace).toNormalizedByteString()) + .isEqualTo(DN.valueOf(withoutWhiteSpace).toNormalizedByteString()); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java index fd5054789..d102f6e64 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2011 ForgeRock AS. + * Copyright 2011-2016 ForgeRock AS. * Portions copyright 2012 ForgeRock AS. * Portions Copyright 2014 Manuel Gaupp */ @@ -1122,8 +1122,7 @@ public void testParseChangeRecordEntryWithDeleteControl() throws Exception { // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(DeleteRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.2.840.113556.1.4.805"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("cn"); @@ -1154,8 +1153,7 @@ public void testParseChangeRecordEntryWithAddControl() throws Exception { // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("cn"); @@ -1213,8 +1211,7 @@ public void testParseChangeRecordEntryWithAddControlWithoutSpacesBetweenCritical // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("cn"); @@ -1245,8 +1242,7 @@ public void testParseChangeRecordEntryWithAddControlContainingWhiteSpaces() thro // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("sn"); @@ -1389,8 +1385,7 @@ public void testParseChangeRecordEntryWithAddControlWithoutValue() throws Except // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue()).isNull(); @@ -1421,8 +1416,7 @@ public void testParseChangeRecordEntryWithAddControlWithoutCriticality() throws // Read the record ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("description"); @@ -1500,24 +1494,21 @@ public void testParseChangeRecordEntryWithMultipleControls() throws Exception { reader.setSchemaValidationPolicy(SchemaValidationPolicy.defaultPolicy()); // 1st ChangeRecord record = reader.readChangeRecord(); - assertThat(record.getName().toString()).isEqualTo( - "ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.1"); assertThat(record.getControls().get(0).getValue()).isNull(); //2nd record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "cn=Paul Jensen, ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("cn=Paul Jensen,ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.13"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("cn"); //3rd record = reader.readChangeRecord(); assertThat(record).isInstanceOf(AddRequest.class); - assertThat(record.getName().toString()).isEqualTo( - "cn=Paula Jensen, ou=Product Development, dc=airius, dc=com"); + assertThat(record.getName().toString()).isEqualTo("cn=Paula Jensen,ou=Product Development,dc=airius,dc=com"); assertThat(record.getControls()).isNotEmpty(); assertThat(record.getControls().get(0).getOID()).isEqualTo("1.3.6.1.1.13.13.16"); assertThat(record.getControls().get(0).getValue().toString()).isEqualTo("sn"); @@ -1525,8 +1516,7 @@ record = reader.readChangeRecord(); } /** - * Test to read an record containing an invalid control. (pair.value is - * null) Must throw a DecodeException. + * Test to read an record containing an invalid control. (pair.value is null) Must throw a DecodeException. * * @throws Exception */ diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java index 1c45a2e97..0bfc7a3fa 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2011-2015 ForgeRock AS. + * Copyright 2011-2016 ForgeRock AS. * Portions copyright 2012 ForgeRock AS. */ @@ -823,8 +823,7 @@ public void testWriteDeleteRequest() throws Exception { writer.writeChangeRecord(changeRequest); writer.close(); - assertThat(actual.get(0)) - .isEqualTo("dn: cn=Robert Jensen, ou=Marketing, dc=airius, dc=com"); + assertThat(actual.get(0)).isEqualTo("dn: cn=Robert Jensen,ou=Marketing,dc=airius,dc=com"); assertThat(actual.get(1)).isEqualTo("changetype: delete"); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java index 40fc8169f..1fdbcf539 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldif; @@ -1105,33 +1105,27 @@ public void testLDIFEntryReaderFullEntry() throws Exception { // @formatter:on final String path = TestCaseUtils.createTempFile(strEntry); final FileInputStream in = new FileInputStream(path); - final LDIFEntryReader reader = new LDIFEntryReader(in); - Entry entry = null; - try { + try (LDIFEntryReader reader = new LDIFEntryReader(in)) { assertThat(reader.hasNext()); // 1st entry - entry = reader.readEntry(); - assertThat(entry.getName().toString()).isEqualTo( - "cn=Barbara Jensen, ou=Product Development, dc=airius, dc=com"); + Entry entry = reader.readEntry(); + assertThat(entry.getName() + .toString()).isEqualTo("cn=Barbara Jensen,ou=Product Development,dc=airius,dc=com"); assertThat(entry.getAttributeCount()).isEqualTo(6); // 2nd entry = reader.readEntry(); - assertThat(entry.getName().toString()).isEqualTo( - "cn=Bjorn Jensen, ou=Accounting, dc=airius, dc=com"); + assertThat(entry.getName().toString()).isEqualTo("cn=Bjorn Jensen,ou=Accounting,dc=airius,dc=com"); assertThat(entry.getAttributeCount()).isEqualTo(4); assertThat(reader.hasNext()).isFalse(); - } finally { - reader.close(); } } /** - * Tries to read an entry composed by multi-valued attributes. The - * multi-valued attributes contains an interesting case where two of them - * represents the same value, one in uppercase and the other in lower case. + * Tries to read an entry composed by multi-valued attributes. The multi-valued attributes contains an interesting + * case where two of them represents the same value, one in uppercase and the other in lower case. * * @throws Exception */ From bbd0ae3b009611cb1cfafa1d00b6f8c4d147c376 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 01:43:53 +0100 Subject: [PATCH 093/125] OPENDJ-2776 don't escape '=' in attribute values According to RFC 4514 the '=' character does not need escaping. In addition, re-enabled the unit tests for DN.toString() which were surprisingly commented out. --- .../src/main/java/org/forgerock/opendj/ldap/AVA.java | 2 +- .../java/org/forgerock/opendj/ldap/DNTestCase.java | 12 ++++++------ .../opendj/rest2ldap/AuthzIdTemplateTest.java | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java index 599f28bab..34691b723 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java @@ -167,7 +167,7 @@ static void escapeAttributeValue(final String str, final StringBuilder builder) } else { if ((c == ' ' && si == length - 1) || (c == '"' || c == '+' || c == ',' || c == ';' || c == '<' - || c == '=' || c == '>' || c == '\\' || c == '\u0000')) { + || c == '>' || c == '\\' || c == '\u0000')) { builder.append('\\'); } builder.append(c); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java index 816669737..3d4d71418 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java @@ -93,7 +93,7 @@ public Object[][] createData() { "cn=doe+givenname=john,ou=people,dc=example,dc=com", "givenName=John+cn=Doe,ou=People,dc=example,dc=com" }, { "givenName=John\\+cn=Doe,ou=People,dc=example,dc=com", - "givenname=john\\+cn\\=doe,ou=people,dc=example,dc=com", + "givenname=john\\+cn=doe,ou=people,dc=example,dc=com", "givenName=John\\+cn=Doe,ou=People,dc=example,dc=com" }, { "cn=Doe\\, John,ou=People,dc=example,dc=com", "cn=doe\\, john,ou=people,dc=example,dc=com", @@ -115,7 +115,7 @@ public Object[][] createData() { "cn=before after,dc=example,dc=net", "CN=Before\\0dAfter,DC=example,DC=net" }, { "2.5.4.3=#04024869", // Unicode codepoints from 0000-0008 are mapped to nothing. - "cn=hi", "2.5.4.3=\\04\\02Hi" }, + "cn=hi", "2.5.4.3=#04024869" }, { "1.1.1=", "1.1.1=", "1.1.1=" }, { "CN=Lu\\C4\\8Di\\C4\\87", "cn=lu\u010di\u0107", "CN=Lu\u010di\u0107" }, { "ou=\\e5\\96\\b6\\e6\\a5\\ad\\e9\\83\\a8,o=Airius", "ou=\u55b6\u696d\u90e8,o=airius", @@ -807,8 +807,8 @@ public void testSuperiorDN(final String base, final String sub, final boolean e) @Test(dataProvider = "testDNs") public void testToString(final String rawDN, final String normDN, final String stringDN) throws Exception { - // DN dn = DN.valueOf(rawDN); - // assertEquals(dn.toString(), stringDN); + DN dn = DN.valueOf(rawDN); + assertThat(dn.toString()).isEqualTo(stringDN); } /** @@ -1004,14 +1004,14 @@ public void testFormatEscape() { DN actual = DN.format("uid=%s,dc=test", "#cn=foo+sn=bar"); DN expected = DN.valueOf("dc=test").child("uid", "#cn=foo+sn=bar"); assertEquals(actual, expected); - assertEquals(actual.toString(), "uid=\\#cn\\=foo\\+sn\\=bar,dc=test"); + assertEquals(actual.toString(), "uid=\\#cn=foo\\+sn=bar,dc=test"); } /** Tests the {@link DN#escapeAttributeValue(Object)} method. */ @Test public void testEscapeAttributeValue() { String actual = DN.escapeAttributeValue("#cn=foo+sn=bar"); - assertEquals(actual, "\\#cn\\=foo\\+sn\\=bar"); + assertEquals(actual, "\\#cn=foo\\+sn=bar"); } /** Tests the {@link DN#toNormalizedByteString()} method. */ diff --git a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java index 24a9d8b72..b79103626 100644 --- a/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java +++ b/opendj-rest2ldap/src/test/java/org/forgerock/opendj/rest2ldap/AuthzIdTemplateTest.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions copyright [year] [name of copyright owner]". * - * Copyright 2013-2015 ForgeRock AS. + * Copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.rest2ldap; @@ -45,7 +45,7 @@ public Object[][] templateData() { { // Should perform DN quoting. "dn:uid={uid},ou={realm},dc=example,dc=com", - "dn:uid=test.user,ou=test\\+cn\\=quoting,dc=example,dc=com", + "dn:uid=test.user,ou=test\\+cn=quoting,dc=example,dc=com", map("uid", "test.user", "realm", "test+cn=quoting") }, { From e2a90caa594d44ec12027ece1a5a917dff7f3f17 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 18:45:39 +0100 Subject: [PATCH 094/125] Minor cleanup --- .../forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java | 1 - 1 file changed, 1 deletion(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java index 0bfc7a3fa..96e6642ec 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java @@ -12,7 +12,6 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions copyright 2012 ForgeRock AS. */ package org.forgerock.opendj.ldif; From cb8f891d0c27a77ee18903603dadb599c1d186b0 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 18:46:57 +0100 Subject: [PATCH 095/125] Minor: fix unit tests that were passing in DNs instead of RDNs for modifyDN operations --- .../ldap/requests/ModifyDNRequestTestCase.java | 8 ++++---- .../ldif/LDIFChangeRecordReaderTestCase.java | 15 +++++---------- .../org/forgerock/opendj/ldif/LDIFTestCase.java | 8 ++++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java index b04d46482..abdc7a64d 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2010 Sun Microsystems, Inc. - * Portions copyright 2013 ForgeRock AS. + * Portions copyright 2013-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.requests; @@ -31,7 +31,7 @@ public class ModifyDNRequestTestCase extends RequestsTestCase { private static final ModifyDNRequest NEW_MODIFY_DN_REQUEST = Requests.newModifyDNRequest( - "uid=user.100,ou=people,o=test", "uid=100.user,ou=people,o=testl"); + "uid=user.100,ou=people,o=test", "uid=100.user"); private static final ModifyDNRequest NEW_MODIFY_DN_REQUEST2 = Requests.newModifyDNRequest( "cn=ModifyDNrequesttestcase", "cn=xyz"); @@ -102,13 +102,13 @@ public void testUnmodifiableSetName2(final ModifyDNRequest original) { @Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class) public void testUnmodifiableSetNewRDN(final ModifyDNRequest original) { final ModifyDNRequest unmodifiable = (ModifyDNRequest) unmodifiableOf(original); - unmodifiable.setNewRDN("dc=example,dc=org"); + unmodifiable.setNewRDN("dc=org"); } @Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class) public void testUnmodifiableSetNewRDN2(final ModifyDNRequest original) { final ModifyDNRequest unmodifiable = (ModifyDNRequest) unmodifiableOf(original); - unmodifiable.setNewRDN(RDN.valueOf("dc=example,dc=org")); + unmodifiable.setNewRDN(RDN.valueOf("dc=org")); } @Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class) diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java index d102f6e64..f6b75c09a 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java @@ -12,7 +12,6 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2011-2016 ForgeRock AS. - * Portions copyright 2012 ForgeRock AS. * Portions Copyright 2014 Manuel Gaupp */ @@ -1516,12 +1515,10 @@ record = reader.readChangeRecord(); } /** - * Test to read an record containing an invalid control. (pair.value is null) Must throw a DecodeException. - * - * @throws Exception + * Tests that change records containing an empty control are rejected. */ @Test(expectedExceptions = DecodeException.class) - public void testParseChangeRecordEntryWithAddControlPairKeyNull() throws Exception { + public void testParseChangeRecordEntryRejectedWhenControlIsEmpty() throws Exception { // @formatter:off final LDIFChangeRecordReader reader = new LDIFChangeRecordReader( @@ -1963,7 +1960,7 @@ public void testParseModifyDNChangeRecordEntryRecordBase64NewRDN() throws Except LDIFChangeRecordReader reader = new LDIFChangeRecordReader( "dn::ZGM9cGVvcGxlLGRjPWV4YW1wbGUsZGM9b3Jn", "changetype: modrdn", - "newrdn::ZGM9cGVvcGxlLGRjPWV4YW1wbGUsZGM9Y29t", + "newrdn::ZGM9cGVvcGxl", "deleteoldrdn: 1" ); // @formatter:on @@ -1972,10 +1969,8 @@ public void testParseModifyDNChangeRecordEntryRecordBase64NewRDN() throws Except ChangeRecord record = reader.readChangeRecord(); assertThat(record).isInstanceOf(ModifyDNRequest.class); ModifyDNRequest modifyDNRequest = (ModifyDNRequest) record; - assertThat((Object) modifyDNRequest.getName()).isEqualTo( - DN.valueOf("dc=people,dc=example,dc=org")); - assertThat((Object) modifyDNRequest.getNewRDN()).isEqualTo( - RDN.valueOf("dc=people,dc=example,dc=com")); + assertThat((Object) modifyDNRequest.getName()).isEqualTo(DN.valueOf("dc=people,dc=example,dc=org")); + assertThat((Object) modifyDNRequest.getNewRDN()).isEqualTo(RDN.valueOf("dc=people")); assertThat(modifyDNRequest.isDeleteOldRDN()).isTrue(); reader.close(); } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java index 24db44bec..b8d8a943b 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java @@ -1916,7 +1916,7 @@ public final void testLdifPatchModifyDnEntryBranch() throws Exception { final LDIFChangeRecordReader patch = new LDIFChangeRecordReader( "dn: ou=People,dc=example,dc=com", "changetype: modrdn", - "newrdn: ou=Human Resources,dc=example,dc=com", + "newrdn: ou=Human Resources", "deleteoldrdn: 1" ); // @formatter:on @@ -2012,7 +2012,7 @@ public final void testLdifPatchModifyDnEntryBranchKeepsOldRdn() throws Exception final LDIFChangeRecordReader patch = new LDIFChangeRecordReader( "dn: ou=People,dc=example,dc=com", "changetype: modrdn", - "newrdn: ou=Human Resources,dc=example,dc=com", + "newrdn: ou=Human Resources", "deleteoldrdn: 0" ); // @formatter:on @@ -2582,7 +2582,7 @@ public final void testOverwritePatchOnModifyDNRequestSucceedsEvenWithWrongDN() t final LDIFChangeRecordReader patch = new LDIFChangeRecordReader( "dn: ou=WRONGscarter, dc=example,dc=com", "changetype: modrdn", - "newrdn: ou=Human Resources,dc=example,dc=com", + "newrdn: ou=Human Resources", "deleteoldrdn: 1" ); // @formatter:on @@ -2684,7 +2684,7 @@ public final void testOverwritePatchOnModifyDNRequestSucceedsEvenWithDuplicateEn final LDIFChangeRecordReader patch = new LDIFChangeRecordReader( "dn: uid=scarter,ou=People,dc=example,dc=com", "changetype: moddn", - "newrdn: uid=user.2,ou=People,dc=example,dc=com", + "newrdn: uid=user.2", "deleteoldrdn: 0" ); // @formatter:on From 0688e8ac6a15f4b557364ad6efc3907c222f0a69 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Wed, 16 Mar 2016 18:51:45 +0100 Subject: [PATCH 096/125] OPENDJ-2776 Migrate remaining DN/RDN unit tests from the server The unit tests exposed several bugs: * RDN.valueOf() ignored trailing RDN sequences or garbage * RDN constructors allowed zero AVAs * RDN constructors allowed AVAs having duplicate attribute types * AVA decoding allowed OIDs with trailing "." characters. --- .../java/org/forgerock/opendj/ldap/AVA.java | 228 +++++++------- .../java/org/forgerock/opendj/ldap/DN.java | 31 +- .../java/org/forgerock/opendj/ldap/RDN.java | 71 ++++- .../com/forgerock/opendj/ldap/core.properties | 5 + .../org/forgerock/opendj/ldap/DNTestCase.java | 287 +++++++++++++----- .../forgerock/opendj/ldap/RDNTestCase.java | 82 +++-- 6 files changed, 452 insertions(+), 252 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java index 34691b723..935053a23 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java @@ -176,86 +176,6 @@ static void escapeAttributeValue(final String str, final StringBuilder builder) } } - private static ByteString delimitAndEvaluateEscape(final SubstringReader reader) { - final StringBuilder valueBuffer = new StringBuilder(); - StringBuilder hexBuffer = null; - reader.skipWhitespaces(); - - boolean escaped = false; - int trailingSpaces = 0; - while (reader.remaining() > 0) { - final char c = reader.read(); - if (escaped) { - // This character is escaped. - if (isHexDigit(c)) { - // Unicode characters. - if (reader.remaining() <= 0) { - throw new LocalizedIllegalArgumentException( - ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); - } - - // Check the next byte for hex. - final char c2 = reader.read(); - if (isHexDigit(c2)) { - if (hexBuffer == null) { - hexBuffer = new StringBuilder(); - } - hexBuffer.append(c); - hexBuffer.append(c2); - // We may be at the end. - if (reader.remaining() == 0) { - appendHexChars(reader, valueBuffer, hexBuffer); - } - } else { - throw new LocalizedIllegalArgumentException( - ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); - } - } else { - appendHexChars(reader, valueBuffer, hexBuffer); - valueBuffer.append(c); - } - escaped = false; - } else if (c == '\\') { - escaped = true; - trailingSpaces = 0; - } else { - // Check for delimited chars. - if (c == '+' || c == ',' || c == ';') { - reader.reset(); - appendHexChars(reader, valueBuffer, hexBuffer); - valueBuffer.setLength(valueBuffer.length() - trailingSpaces); - return ByteString.valueOfUtf8(valueBuffer); - } - // It is definitely not a delimiter at this point. - appendHexChars(reader, valueBuffer, hexBuffer); - valueBuffer.append(c); - trailingSpaces = c != ' ' ? 0 : trailingSpaces + 1; - } - reader.mark(); - } - - reader.reset(); - valueBuffer.setLength(valueBuffer.length() - trailingSpaces); - return ByteString.valueOfUtf8(valueBuffer); - } - - private static void appendHexChars(final SubstringReader reader, - final StringBuilder valueBuffer, - final StringBuilder hexBuffer) { - if (hexBuffer == null) { - return; - } - final ByteString bytes = ByteString.valueOfHex(hexBuffer.toString()); - try { - valueBuffer.append(new String(bytes.toByteArray(), "UTF-8")); - } catch (final Exception e) { - throw new LocalizedIllegalArgumentException( - ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), String.valueOf(e))); - } - // Clean up the hex buffer. - hexBuffer.setLength(0); - } - private static String readAttributeName(final SubstringReader reader) { int length = 1; reader.mark(); @@ -267,7 +187,6 @@ private static String readAttributeName(final SubstringReader reader) { boolean lastWasPeriod = false; while (reader.remaining() > 0) { c = reader.read(); - if (c == '=' || c == ' ') { // This signals the end of the OID. break; @@ -283,29 +202,28 @@ private static String readAttributeName(final SubstringReader reader) { } length++; } + if (lastWasPeriod) { + throw illegalCharacter(reader, '.'); + } } else if (isAlpha(c)) { // This must be an attribute description. In this case, we will // only accept alphabetic characters, numeric digits, and the // hyphen. while (reader.remaining() > 0) { c = reader.read(); - if (c == '=' || c == ' ') { // This signals the end of the OID. break; } else if (!isAlpha(c) && !isDigit(c) && c != '-') { throw illegalCharacter(reader, c); } - length++; } } else { throw illegalCharacter(reader, c); } - - reader.reset(); - // Return the position of the first non-space character after the token + reader.reset(); return reader.read(length); } @@ -333,47 +251,18 @@ private static ByteString readAttributeValue(final SubstringReader reader) { // Value is HEX encoded BER. return readAttributeValueAsBER(reader); } else if (c == '"') { - // The value should continue until the corresponding closing quotation mark. - return readAttributeValueWithinQuotes(reader); + // Legacy support for RFC 2253. The value should continue until the + // corresponding closing quotation mark and has the same format as + // RFC 4514 attribute values, except that special characters, + // excluding double quote and back-slash, do not need escaping. + reader.mark(); + return readAttributeValue(reader, true); } else { // Otherwise, use general parsing to find the end of the value. - return readAttributeValueUnescaped(reader); + return readAttributeValue(reader, false); } } - private static ByteString readAttributeValueUnescaped(final SubstringReader reader) { - reader.reset(); - final ByteString bytes = delimitAndEvaluateEscape(reader); - if (bytes.length() == 0) { - // We don't allow an empty attribute value. - final LocalizableMessage message = - ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(reader.getString(), reader.pos()); - throw new LocalizedIllegalArgumentException(message); - } - return bytes; - } - - private static ByteString readAttributeValueWithinQuotes(final SubstringReader reader) { - int length = 0; - reader.mark(); - while (true) { - if (reader.remaining() <= 0) { - // We hit the end of the AVA before the closing quote. That's an error. - throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(reader.getString())); - } - - if (reader.read() == '"') { - // This is the end of the value. - break; - } - length++; - } - reader.reset(); - final ByteString retString = ByteString.valueOfUtf8(reader.read(length)); - reader.read(); - return retString; - } - private static ByteString readAttributeValueAsBER(final SubstringReader reader) { // The first two characters must be hex characters. reader.mark(); @@ -433,6 +322,101 @@ private static ByteString readAttributeValueAsBER(final SubstringReader reader) } } + private static ByteString readAttributeValue(final SubstringReader reader, final boolean isQuoted) { + reader.reset(); + final ByteString bytes = delimitAndEvaluateEscape(reader, isQuoted); + if (bytes.length() == 0) { + // We don't allow an empty attribute value. + final LocalizableMessage message = + ERR_ATTR_SYNTAX_DN_INVALID_REQUIRES_ESCAPE_CHAR.get(reader.getString(), reader.pos()); + throw new LocalizedIllegalArgumentException(message); + } + return bytes; + } + + private static ByteString delimitAndEvaluateEscape(final SubstringReader reader, final boolean isQuoted) { + final StringBuilder valueBuffer = new StringBuilder(); + StringBuilder hexBuffer = null; + boolean escaped = false; + int trailingSpaces = 0; + while (reader.remaining() > 0) { + final char c = reader.read(); + if (escaped) { + // This character is escaped. + if (isHexDigit(c)) { + // Unicode characters. + if (reader.remaining() <= 0) { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); + } + + // Check the next byte for hex. + final char c2 = reader.read(); + if (isHexDigit(c2)) { + if (hexBuffer == null) { + hexBuffer = new StringBuilder(); + } + hexBuffer.append(c); + hexBuffer.append(c2); + // We may be at the end. + if (reader.remaining() == 0) { + appendHexChars(reader, valueBuffer, hexBuffer); + } + } else { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ESCAPED_HEX_VALUE_INVALID.get(reader.getString())); + } + } else { + appendHexChars(reader, valueBuffer, hexBuffer); + valueBuffer.append(c); + } + escaped = false; + } else if (c == '\\') { + escaped = true; + trailingSpaces = 0; + } else if (isQuoted && c == '"') { + appendHexChars(reader, valueBuffer, hexBuffer); + reader.skipWhitespaces(); + return ByteString.valueOfUtf8(valueBuffer); + } else if (!isQuoted && (c == '+' || c == ',' || c == ';')) { + reader.reset(); + appendHexChars(reader, valueBuffer, hexBuffer); + valueBuffer.setLength(valueBuffer.length() - trailingSpaces); + return ByteString.valueOfUtf8(valueBuffer); + } else { + // It is definitely not a delimiter at this point. + appendHexChars(reader, valueBuffer, hexBuffer); + valueBuffer.append(c); + trailingSpaces = c != ' ' ? 0 : trailingSpaces + 1; + } + reader.mark(); + } + if (isQuoted) { + // We hit the end of the AVA before the closing quote. That's an error. + throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_DN_UNMATCHED_QUOTE.get(reader.getString())); + } + reader.reset(); + valueBuffer.setLength(valueBuffer.length() - trailingSpaces); + return ByteString.valueOfUtf8(valueBuffer); + } + + private static void appendHexChars(final SubstringReader reader, + final StringBuilder valueBuffer, + final StringBuilder hexBuffer) { + if (hexBuffer == null) { + return; + } + final ByteString bytes = ByteString.valueOfHex(hexBuffer.toString()); + try { + valueBuffer.append(new String(bytes.toByteArray(), "UTF-8")); + } catch (final Exception e) { + throw new LocalizedIllegalArgumentException( + ERR_ATTR_SYNTAX_DN_ATTR_VALUE_DECODE_FAILURE.get(reader.getString(), String.valueOf(e))); + } + // Clean up the hex buffer. + hexBuffer.setLength(0); + } + private final AttributeType attributeType; private final String attributeName; private final ByteString attributeValue; diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java index ad247e045..3a1a44b53 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java @@ -24,7 +24,6 @@ import java.util.UUID; import java.util.WeakHashMap; -import org.forgerock.i18n.LocalizableMessage; import org.forgerock.i18n.LocalizedIllegalArgumentException; import org.forgerock.opendj.ldap.schema.CoreSchema; import org.forgerock.opendj.ldap.schema.Schema; @@ -263,34 +262,33 @@ private static DN decode(final SubstringReader reader, final Schema schema, fina return ROOT_DN; } - RDN rdn; + final RDN rdn; try { rdn = RDN.decode(reader, schema); } catch (final UnknownSchemaElementException e) { - final LocalizableMessage message = - ERR_DN_TYPE_NOT_FOUND.get(reader.getString(), e.getMessageObject()); - throw new LocalizedIllegalArgumentException(message); + throw new LocalizedIllegalArgumentException( + ERR_DN_TYPE_NOT_FOUND.get(reader.getString(), e.getMessageObject())); } - DN parent; if (reader.remaining() > 0 && reader.read() == ',') { + reader.skipWhitespaces(); + if (reader.remaining() == 0) { + throw new LocalizedIllegalArgumentException(ERR_ATTR_SYNTAX_DN_ATTR_NO_NAME.get(reader.getString())); + } reader.mark(); final String parentString = reader.read(reader.remaining()); - - parent = cache.get(parentString); + DN parent = cache.get(parentString); if (parent == null) { reader.reset(); parent = decode(reader, schema, cache); - // Only cache parent DNs since leaf DNs are likely to make the - // cache to volatile. + // Only cache parent DNs since leaf DNs are likely to make the cache to volatile. cache.put(parentString, parent); } + return new DN(schema, parent, rdn); } else { - parent = ROOT_DN; + return new DN(schema, ROOT_DN, rdn); } - - return new DN(schema, parent, rdn); } @SuppressWarnings("serial") @@ -320,7 +318,10 @@ protected boolean removeEldestEntry(final Map.Entry e) { */ private ByteString normalizedDN; - /** The RFC 4514 string representation of this DN. */ + /** + * The RFC 4514 string representation of this DN. A value of {@code null} + * indicates that the value needs to be computed lazily. + */ private String stringValue; /** The schema used to create this DN. */ @@ -337,7 +338,7 @@ private DN(final Schema schema, final DN parent, final RDN rdn, final int size) this.parent = parent; this.rdn = rdn; this.size = size; - this.stringValue = rdn == null ? "" : null; // Compute lazily. + this.stringValue = rdn == null ? "" : null; } /** diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java index 85854ac55..5430c05ac 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java @@ -16,12 +16,14 @@ */ package org.forgerock.opendj.ldap; +import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_DUPLICATE_AVA_TYPES; +import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_NO_AVAS; +import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_TRAILING_GARBAGE; +import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_TYPE_NOT_FOUND; import static org.forgerock.opendj.ldap.DN.AVA_CHAR_SEPARATOR; -import static org.forgerock.opendj.ldap.DN.RDN_CHAR_SEPARATOR; import static org.forgerock.opendj.ldap.DN.NORMALIZED_AVA_SEPARATOR; import static org.forgerock.opendj.ldap.DN.NORMALIZED_RDN_SEPARATOR; - -import static com.forgerock.opendj.ldap.CoreMessages.ERR_RDN_TYPE_NOT_FOUND; +import static org.forgerock.opendj.ldap.DN.RDN_CHAR_SEPARATOR; import java.util.ArrayList; import java.util.Arrays; @@ -72,12 +74,12 @@ public final class RDN implements Iterable, Comparable { * A constant holding a special RDN having zero AVAs * and which sorts before any RDN other than itself. */ - private static final RDN MIN_VALUE = new RDN(new AVA[0], ""); + private static final RDN MIN_VALUE = new RDN(); /** * A constant holding a special RDN having zero AVAs * and which sorts after any RDN other than itself. */ - private static final RDN MAX_VALUE = new RDN(new AVA[0], ""); + private static final RDN MAX_VALUE = new RDN(); /** * Returns a constant containing a special RDN which sorts before any @@ -160,14 +162,19 @@ public static RDN valueOf(final String rdn) { */ public static RDN valueOf(final String rdn, final Schema schema) { final SubstringReader reader = new SubstringReader(rdn); + final RDN parsedRdn; try { - return decode(reader, schema); + parsedRdn = decode(reader, schema); } catch (final UnknownSchemaElementException e) { throw new LocalizedIllegalArgumentException(ERR_RDN_TYPE_NOT_FOUND.get(rdn, e.getMessageObject())); } + if (reader.remaining() > 0) { + throw new LocalizedIllegalArgumentException( + ERR_RDN_TRAILING_GARBAGE.get(rdn, reader.read(reader.remaining()))); + } + return parsedRdn; } - /** FIXME: ensure that the decoded RDN does not contain multiple AVAs with the same type. */ static RDN decode(final SubstringReader reader, final Schema schema) { final AVA firstAVA = AVA.decode(reader, schema); @@ -189,10 +196,10 @@ static RDN decode(final SubstringReader reader, final Schema schema) { } while (reader.remaining() > 0 && reader.read() == '+'); reader.reset(); - return new RDN(avas.toArray(new AVA[avas.size()]), null); + return new RDN(avas); } else { reader.reset(); - return new RDN(new AVA[] { firstAVA }, null); + return new RDN(firstAVA); } } @@ -251,9 +258,40 @@ public RDN(final String attributeType, final Object attributeValue) { * The attribute-value assertions used to build this RDN. * @throws NullPointerException * If {@code avas} is {@code null} or contains a null ava. + * @throws IllegalArgumentException + * If {@code avas} is empty. */ public RDN(final AVA... avas) { - this(avas, null); + Reject.ifNull(avas); + this.avas = validateAvas(avas); + } + + private AVA[] validateAvas(final AVA[] avas) { + switch (avas.length) { + case 0: + throw new LocalizedIllegalArgumentException(ERR_RDN_NO_AVAS.get()); + case 1: + // Guaranteed to be valid. + break; + case 2: + if (avas[0].getAttributeType().equals(avas[1].getAttributeType())) { + throw new LocalizedIllegalArgumentException( + ERR_RDN_DUPLICATE_AVA_TYPES.get(avas[0].getAttributeName())); + } + break; + default: + final AVA[] sortedAVAs = Arrays.copyOf(avas, avas.length); + Arrays.sort(sortedAVAs); + AttributeType previousAttributeType = null; + for (AVA ava : sortedAVAs) { + if (ava.getAttributeType().equals(previousAttributeType)) { + throw new LocalizedIllegalArgumentException( + ERR_RDN_DUPLICATE_AVA_TYPES.get(ava.getAttributeName())); + } + previousAttributeType = ava.getAttributeType(); + } + } + return avas; } /** @@ -263,15 +301,18 @@ public RDN(final AVA... avas) { * The attribute-value assertions used to build this RDN. * @throws NullPointerException * If {@code ava} is {@code null} or contains null ava. + * @throws IllegalArgumentException + * If {@code avas} is empty. */ public RDN(Collection avas) { - this(avas.toArray(new AVA[avas.size()]), null); + Reject.ifNull(avas); + this.avas = validateAvas(avas.toArray(new AVA[avas.size()])); } - private RDN(final AVA[] avas, final String stringValue) { - Reject.ifNull(avas); - this.avas = avas; - this.stringValue = stringValue; + // Special constructor for min/max RDN values. + private RDN() { + this.avas = new AVA[0]; + this.stringValue = ""; } @Override diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties index 27d3ed870..f2cf12d50 100644 --- a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties +++ b/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties @@ -469,6 +469,11 @@ ERR_NO_SUBSCHEMA_SUBENTRY_ATTR=The entry %s does not include \ a subschemaSubentry attribute ERR_RDN_TYPE_NOT_FOUND=The RDN "%s" could not be parsed due to the \ following reason: %s +ERR_RDN_TRAILING_GARBAGE=The RDN "%s" could not be parsed because it \ + contained trailing content after the RDN: "%s" +ERR_RDN_DUPLICATE_AVA_TYPES=An RDN contained multiple components \ + having the same attribute type "%s" +ERR_RDN_NO_AVAS=An RDN must contain at least one attribute type and value ERR_DN_TYPE_NOT_FOUND=The DN "%s" could not be parsed due to the \ following reason: %s ERR_ATTRIBUTE_DESCRIPTION_EMPTY=The attribute description \ diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java index 3d4d71418..6c03e6f83 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java @@ -16,11 +16,12 @@ */ package org.forgerock.opendj.ldap; -import static java.lang.Integer.*; - +import static java.lang.Integer.signum; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; -import static org.assertj.core.api.Assertions.*; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; import java.util.Collection; import java.util.Iterator; @@ -45,13 +46,19 @@ public class DNTestCase extends SdkTestCase { */ @DataProvider(name = "createChildDNTestData") public Object[][] createChildDNTestData() { - return new Object[][] { { "", "", "" }, { "", "dc=org", "dc=org" }, - { "", "dc=opendj,dc=org", "dc=opendj,dc=org" }, { "dc=org", "", "dc=org" }, + // @formatter:off + return new Object[][] { + { "", "", "" }, + { "", "dc=org", "dc=org" }, + { "", "dc=opendj,dc=org", "dc=opendj,dc=org" }, + { "dc=org", "", "dc=org" }, { "dc=org", "dc=opendj", "dc=opendj,dc=org" }, { "dc=org", "dc=foo,dc=opendj", "dc=foo,dc=opendj,dc=org" }, { "dc=opendj,dc=org", "", "dc=opendj,dc=org" }, { "dc=opendj,dc=org", "dc=foo", "dc=foo,dc=opendj,dc=org" }, - { "dc=opendj,dc=org", "dc=bar,dc=foo", "dc=bar,dc=foo,dc=opendj,dc=org" }, }; + { "dc=opendj,dc=org", "dc=bar,dc=foo", "dc=bar,dc=foo,dc=opendj,dc=org" }, + }; + // @formatter:on } /** @@ -61,9 +68,14 @@ public Object[][] createChildDNTestData() { */ @DataProvider(name = "createChildRDNTestData") public Object[][] createChildRDNTestData() { - return new Object[][] { { "", "dc=org", "dc=org" }, + // @formatter:off + return new Object[][] { + { "", "dc=org", "dc=org" }, { "dc=org", "dc=opendj", "dc=opendj,dc=org" }, - { "dc=opendj,dc=org", "dc=foo", "dc=foo,dc=opendj,dc=org" }, }; + { "dc=opendj,dc=org", "dc=foo", "dc=foo,dc=opendj,dc=org" }, + }; + // @formatter:on + } /** @@ -73,6 +85,7 @@ public Object[][] createChildRDNTestData() { */ @DataProvider(name = "testDNs") public Object[][] createData() { + // @formatter:off return new Object[][] { { "", "", "" }, { " ", "", "" }, @@ -125,8 +138,12 @@ public Object[][] createData() { { "OU= Sales + CN = J. Smith ,DC=example,DC=net", "cn=j. smith+ou=sales,dc=example,dc=net", "OU=Sales+CN=J. Smith,DC=example,DC=net" }, { "cn=John+dc=", "dc=+cn=john", "cn=John+dc=" }, - { "O=\"Sue, Grabbit and Runn\",C=US", "o=sue\\, grabbit and runn,c=us", - "O=Sue\\, Grabbit and Runn,C=US" }, }; + { "O=\"Sue, Grabbit + Runn\",C=US", "o=sue\\, grabbit \\+ runn,c=us", + "O=Sue\\, Grabbit \\+ Runn,C=US" }, + { "O=\"John \\\"Tiger\\\" Smith\",C=US", "o=john \\\"tiger\\\" smith,c=us", + "O=John \\\"Tiger\\\" Smith,C=US" }, + }; + // @formatter:on } /** @@ -136,22 +153,19 @@ public Object[][] createData() { */ @DataProvider(name = "createDNComparisonData") public Object[][] createDNComparisonData() { - return new Object[][] { { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, + // @formatter:off + return new Object[][] { + { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, { "cn=hello world,dc=com", "CN=hello world,dc=com", 0 }, { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, { " cn = hello world ,dc=com", "cn=hello world,dc=com", 0 }, { "cn=hello world\\ ,dc=com", "cn=hello world,dc=com", 0 }, { "cn=HELLO WORLD,dc=com", "cn=hello world,dc=com", 0 }, { "cn=HELLO+sn=WORLD,dc=com", "sn=world+cn=hello,dc=com", 0 }, - /* - * { "x-test-integer-type=10,dc=com", - * "x-test-integer-type=9,dc=com", 1 }, { - * "x-test-integer-type=999,dc=com", - * "x-test-integer-type=1000,dc=com", -1 }, { - * "x-test-integer-type=-1,dc=com", "x-test-integer-type=0,dc=com", - * -1 }, { "x-test-integer-type=0,dc=com", - * "x-test-integer-type=-1,dc=com", 1 }, - **/ + { "governingStructureRule=10,dc=com", "governingStructureRule=9,dc=com", 1 }, + { "governingStructureRule=999,dc=com", "governingStructureRule=1000,dc=com", -1 }, + { "governingStructureRule=-1,dc=com", "governingStructureRule=0,dc=com", -1 }, + { "governingStructureRule=0,dc=com", "governingStructureRule=-1,dc=com", 1 }, { "cn=aaa,dc=com", "cn=aaaa,dc=com", -1 }, { "cn=AAA,dc=com", "cn=aaaa,dc=com", -1 }, { "cn=aaa,dc=com", "cn=AAAA,dc=com", -1 }, { "cn=aaaa,dc=com", "cn=aaa,dc=com", 1 }, { "cn=AAAA,dc=com", "cn=aaa,dc=com", 1 }, { "cn=aaaa,dc=com", "cn=AAA,dc=com", 1 }, @@ -160,7 +174,9 @@ public Object[][] createDNComparisonData() { { "dc=ccc,dc=aaa", "dc=bbb", -1 }, { "dc=aaa,dc=bbb", "dc=bbb", 1 }, { "dc=bbb,dc=bbb", "dc=bbb", 1 }, { "dc=ccc,dc=bbb", "dc=bbb", 1 }, { "dc=aaa,dc=ccc", "dc=bbb", 1 }, { "dc=bbb,dc=ccc", "dc=bbb", 1 }, - { "dc=ccc,dc=ccc", "dc=bbb", 1 }, { "", "dc=bbb", -1 }, { "dc=bbb", "", 1 } }; + { "dc=ccc,dc=ccc", "dc=bbb", 1 }, { "", "dc=bbb", -1 }, { "dc=bbb", "", 1 } + }; + // @formatter:on } /** @@ -170,26 +186,40 @@ public Object[][] createDNComparisonData() { */ @DataProvider(name = "createDNEqualityData") public Object[][] createDNEqualityData() { - return new Object[][] { { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, + // @formatter:off + return new Object[][] { + { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, { "cn=hello world,dc=com", "CN=hello world,dc=com", 0 }, { "cn=hello world,dc=com", "cn=hello world,dc=com", 0 }, { " cn = hello world ,dc=com", "cn=hello world,dc=com", 0 }, { "cn=hello world\\ ,dc=com", "cn=hello world,dc=com", 0 }, { "cn=HELLO WORLD,dc=com", "cn=hello world,dc=com", 0 }, { "cn=HELLO+sn=WORLD,dc=com", "sn=world+cn=hello,dc=com", 0 }, - { "x-test-integer-type=10,dc=com", "x-test-integer-type=9,dc=com", 1 }, - { "x-test-integer-type=999,dc=com", "x-test-integer-type=1000,dc=com", -1 }, - { "x-test-integer-type=-1,dc=com", "x-test-integer-type=0,dc=com", -1 }, - { "x-test-integer-type=0,dc=com", "x-test-integer-type=-1,dc=com", 1 }, - { "cn=aaa,dc=com", "cn=aaaa,dc=com", -1 }, { "cn=AAA,dc=com", "cn=aaaa,dc=com", -1 }, - { "cn=aaa,dc=com", "cn=AAAA,dc=com", -1 }, { "cn=aaaa,dc=com", "cn=aaa,dc=com", 1 }, - { "cn=AAAA,dc=com", "cn=aaa,dc=com", 1 }, { "cn=aaaa,dc=com", "cn=AAA,dc=com", 1 }, - { "cn=aaab,dc=com", "cn=aaaa,dc=com", 1 }, { "cn=aaaa,dc=com", "cn=aaab,dc=com", -1 }, - { "dc=aaa,dc=aaa", "dc=bbb", -1 }, { "dc=bbb,dc=aaa", "dc=bbb", -1 }, - { "dc=ccc,dc=aaa", "dc=bbb", -1 }, { "dc=aaa,dc=bbb", "dc=bbb", 1 }, - { "dc=bbb,dc=bbb", "dc=bbb", 1 }, { "dc=ccc,dc=bbb", "dc=bbb", 1 }, - { "dc=aaa,dc=ccc", "dc=bbb", 1 }, { "dc=bbb,dc=ccc", "dc=bbb", 1 }, - { "dc=ccc,dc=ccc", "dc=bbb", 1 }, { "", "dc=bbb", -1 }, { "dc=bbb", "", 1 } }; + { "governingStructureRule=10,dc=com", "governingStructureRule=9,dc=com", 1 }, + { "governingStructureRule=999,dc=com", "governingStructureRule=1000,dc=com", -1 }, + { "governingStructureRule=-1,dc=com", "governingStructureRule=0,dc=com", -1 }, + { "governingStructureRule=0,dc=com", "governingStructureRule=-1,dc=com", 1 }, + { "cn=aaa,dc=com", "cn=aaaa,dc=com", -1 }, + { "cn=AAA,dc=com", "cn=aaaa,dc=com", -1 }, + { "cn=aaa,dc=com", "cn=AAAA,dc=com", -1 }, + { "cn=aaaa,dc=com", "cn=aaa,dc=com", 1 }, + { "cn=AAAA,dc=com", "cn=aaa,dc=com", 1 }, + { "cn=aaaa,dc=com", "cn=AAA,dc=com", 1 }, + { "cn=aaab,dc=com", "cn=aaaa,dc=com", 1 }, + { "cn=aaaa,dc=com", "cn=aaab,dc=com", -1 }, + { "dc=aaa,dc=aaa", "dc=bbb", -1 }, + { "dc=bbb,dc=aaa", "dc=bbb", -1 }, + { "dc=ccc,dc=aaa", "dc=bbb", -1 }, + { "dc=aaa,dc=bbb", "dc=bbb", 1 }, + { "dc=bbb,dc=bbb", "dc=bbb", 1 }, + { "dc=ccc,dc=bbb", "dc=bbb", 1 }, + { "dc=aaa,dc=ccc", "dc=bbb", 1 }, + { "dc=bbb,dc=ccc", "dc=bbb", 1 }, + { "dc=ccc,dc=ccc", "dc=bbb", 1 }, + { "", "dc=bbb", -1 }, + { "dc=bbb", "", 1 } + }; + // @formatter:on } /** @@ -199,7 +229,10 @@ public Object[][] createDNEqualityData() { */ @DataProvider(name = "illegalDNs") public Object[][] createIllegalData() { - return new Object[][] { { "manager" }, { "manager " }, + // @formatter:off + return new Object[][] { + { "manager" }, + { "manager " }, { "=Jim" }, { " =Jim" }, { "= Jim" }, @@ -209,18 +242,41 @@ public Object[][] createIllegalData() { { "cn=Jim+" }, { "cn=Jim+manager" }, { "cn=Jim+manager " }, - { "cn=Jim+manager," }, // { "cn=Jim," }, { "cn=Jim, " }, { - // "c[n]=Jim" }, - { "_cn=Jim" }, { "c_n=Jim" }, { "cn\"=Jim" }, { "c\"n=Jim" }, { "1cn=Jim" }, - { "cn+uid=Jim" }, { "-cn=Jim" }, { "/tmp=a" }, { "\\tmp=a" }, { "cn;lang-en=Jim" }, - { "@cn=Jim" }, { "_name_=Jim" }, + { "cn=Jim+manager," }, + { "cn=Jim," }, + { "cn=Jim, " }, + { "c[n]=Jim" }, + { "_cn=Jim" }, + { "c_n=Jim" }, + { "cn\"=Jim" }, + { "c\"n=Jim" }, + { "1cn=Jim" }, + { "cn+uid=Jim" }, + { "-cn=Jim" }, + { "/tmp=a" }, + { "\\tmp=a" }, + { "cn;lang-en=Jim" }, + { "@cn=Jim" }, + { "_name_=Jim" }, { "\u03c0=pi" }, - { "v1.0=buggy" }, // { "1.=buggy" }, { ".1=buggy" }, - { "oid.1." }, { "1.3.6.1.4.1.1466..0=#04024869" }, { "cn=#a" }, { "cn=#ag" }, - { "cn=#ga" }, { "cn=#abcdefgh" }, - { "cn=a\\b" }, // { "cn=a\\bg" }, { "cn=\"hello" }, - { "cn=+mail=,dc=example,dc=com" }, { "cn=xyz+sn=,dc=example,dc=com" }, - { "cn=,dc=example,dc=com" } }; + { "v1.0=buggy" }, + { "1.=buggy" }, + { ".1=buggy" }, + { "oid.1." }, + { "1.3.6.1.4.1.1466..0=#04024869" }, + { "cn=#a" }, + { "cn=#ag" }, + { "cn=#ga" }, + { "cn=#abcdefgh" }, + { "cn=a\\b" }, + { "cn=a\\bg" }, + { "cn=\"hello" }, + { "cn=+mail=,dc=example,dc=com" }, + { "cn=xyz+sn=,dc=example,dc=com" }, + { "cn=,dc=example,dc=com" }, + { "cn=a+cn=b,dc=example,dc=com" } + }; + // @formatter:on } /** @@ -230,11 +286,17 @@ public Object[][] createIllegalData() { */ @DataProvider(name = "createIsChildOfTestData") public Object[][] createIsChildOfTestData() { - return new Object[][] { { "", "", false }, { "", "dc=org", false }, - { "", "dc=opendj,dc=org", false }, { "", "dc=foo,dc=opendj,dc=org", false }, - { "dc=org", "", true }, { "dc=org", "dc=org", false }, + // @formatter:off + return new Object[][] { + { "", "", false }, + { "", "dc=org", false }, + { "", "dc=opendj,dc=org", false }, + { "", "dc=foo,dc=opendj,dc=org", false }, + { "dc=org", "", true }, + { "dc=org", "dc=org", false }, { "dc=org", "dc=opendj,dc=org", false }, - { "dc=org", "dc=foo,dc=opendj,dc=org", false }, { "dc=opendj,dc=org", "", false }, + { "dc=org", "dc=foo,dc=opendj,dc=org", false }, + { "dc=opendj,dc=org", "", false }, { "dc=opendj,dc=org", "dc=org", true }, { "dc=opendj,dc=org", "dc=opendj,dc=org", false }, { "dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", false }, @@ -242,8 +304,11 @@ public Object[][] createIsChildOfTestData() { { "dc=foo,dc=opendj,dc=org", "dc=org", false }, { "dc=foo,dc=opendj,dc=org", "dc=opendj,dc=org", true }, { "dc=foo,dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", false }, - { "dc=org", "dc=com", false }, { "dc=opendj,dc=org", "dc=foo,dc=org", false }, - { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, }; + { "dc=org", "dc=com", false }, + { "dc=opendj,dc=org", "dc=foo,dc=org", false }, + { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, + }; + // @formatter:on } /** @@ -253,8 +318,15 @@ public Object[][] createIsChildOfTestData() { */ @DataProvider(name = "createNumComponentsTestData") public Object[][] createNumComponentsTestData() { - return new Object[][] { { "", 0 }, { "dc=com", 1 }, { "dc=opendj,dc=com", 2 }, - { "dc=world,dc=opendj,dc=com", 3 }, { "dc=hello,dc=world,dc=opendj,dc=com", 4 }, }; + // @formatter:off + return new Object[][] { + { "", 0 }, + { "dc=com", 1 }, + { "dc=opendj,dc=com", 2 }, + { "dc=world,dc=opendj,dc=com", 3 }, + { "dc=hello,dc=world,dc=opendj,dc=com", 4 }, + }; + // @formatter:on } /** @@ -264,10 +336,15 @@ public Object[][] createNumComponentsTestData() { */ @DataProvider(name = "createParentAndRDNTestData") public Object[][] createParentAndRDNTestData() { - return new Object[][] { { "", null, null }, { "dc=com", "", "dc=com" }, + // @formatter:off + return new Object[][] { + { "", null, null }, + { "dc=com", "", "dc=com" }, { "dc=opendj,dc=com", "dc=com", "dc=opendj" }, { "dc=world,dc=opendj,dc=com", "dc=opendj,dc=com", "dc=world" }, - { "dc=hello,dc=world,dc=opendj,dc=com", "dc=world,dc=opendj,dc=com", "dc=hello" }, }; + { "dc=hello,dc=world,dc=opendj,dc=com", "dc=world,dc=opendj,dc=com", "dc=hello" }, + }; + // @formatter:on } /** @@ -277,12 +354,17 @@ public Object[][] createParentAndRDNTestData() { */ @DataProvider(name = "createRDNTestData") public Object[][] createRDNTestData() { - return new Object[][] { { "dc=com", 0, "dc=com" }, { "dc=opendj,dc=com", 0, "dc=opendj" }, + // @formatter:off + return new Object[][] { + { "dc=com", 0, "dc=com" }, + { "dc=opendj,dc=com", 0, "dc=opendj" }, { "dc=opendj,dc=com", 1, "dc=com" }, { "dc=hello,dc=world,dc=opendj,dc=com", 0, "dc=hello" }, { "dc=hello,dc=world,dc=opendj,dc=com", 1, "dc=world" }, { "dc=hello,dc=world,dc=opendj,dc=com", 2, "dc=opendj" }, - { "dc=hello,dc=world,dc=opendj,dc=com", 3, "dc=com" }, }; + { "dc=hello,dc=world,dc=opendj,dc=com", 3, "dc=com" }, + }; + // @formatter:on } /** @@ -292,19 +374,29 @@ public Object[][] createRDNTestData() { */ @DataProvider(name = "createSubordinateTestData") public Object[][] createSubordinateTestData() { - return new Object[][] { { "", "", true }, { "", "dc=org", false }, - { "", "dc=opendj,dc=org", false }, { "", "dc=foo,dc=opendj,dc=org", false }, - { "dc=org", "", true }, { "dc=org", "dc=org", true }, + // @formatter:off + return new Object[][] { + { "", "", true }, + { "", "dc=org", false }, + { "", "dc=opendj,dc=org", false }, + { "", "dc=foo,dc=opendj,dc=org", false }, + { "dc=org", "", true }, + { "dc=org", "dc=org", true }, { "dc=org", "dc=opendj,dc=org", false }, - { "dc=org", "dc=foo,dc=opendj,dc=org", false }, { "dc=opendj,dc=org", "", true }, + { "dc=org", "dc=foo,dc=opendj,dc=org", false }, + { "dc=opendj,dc=org", "", true }, { "dc=opendj,dc=org", "dc=org", true }, { "dc=opendj,dc=org", "dc=opendj,dc=org", true }, { "dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", false }, - { "dc=foo,dc=opendj,dc=org", "", true }, { "dc=foo,dc=opendj,dc=org", "dc=org", true }, + { "dc=foo,dc=opendj,dc=org", "", true }, + { "dc=foo,dc=opendj,dc=org", "dc=org", true }, { "dc=foo,dc=opendj,dc=org", "dc=opendj,dc=org", true }, { "dc=foo,dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", true }, - { "dc=org", "dc=com", false }, { "dc=opendj,dc=org", "dc=foo,dc=org", false }, - { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, }; + { "dc=org", "dc=com", false }, + { "dc=opendj,dc=org", "dc=foo,dc=org", false }, + { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, + }; + // @formatter:on } /** @@ -314,19 +406,29 @@ public Object[][] createSubordinateTestData() { */ @DataProvider(name = "createSuperiorTestData") public Object[][] createSuperiorTestData() { - return new Object[][] { { "", "", true }, { "", "dc=org", true }, - { "", "dc=opendj,dc=org", true }, { "", "dc=foo,dc=opendj,dc=org", true }, - { "dc=org", "", false }, { "dc=org", "dc=org", true }, - { "dc=org", "dc=opendj,dc=org", true }, { "dc=org", "dc=foo,dc=opendj,dc=org", true }, - { "dc=opendj,dc=org", "", false }, { "dc=opendj,dc=org", "dc=org", false }, + // @formatter:off + return new Object[][] { + { "", "", true }, + { "", "dc=org", true }, + { "", "dc=opendj,dc=org", true }, + { "", "dc=foo,dc=opendj,dc=org", true }, + { "dc=org", "", false }, + { "dc=org", "dc=org", true }, + { "dc=org", "dc=opendj,dc=org", true }, + { "dc=org", "dc=foo,dc=opendj,dc=org", true }, + { "dc=opendj,dc=org", "", false }, + { "dc=opendj,dc=org", "dc=org", false }, { "dc=opendj,dc=org", "dc=opendj,dc=org", true }, { "dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", true }, { "dc=foo,dc=opendj,dc=org", "", false }, { "dc=foo,dc=opendj,dc=org", "dc=org", false }, { "dc=foo,dc=opendj,dc=org", "dc=opendj,dc=org", false }, { "dc=foo,dc=opendj,dc=org", "dc=foo,dc=opendj,dc=org", true }, - { "dc=org", "dc=com", false }, { "dc=opendj,dc=org", "dc=foo,dc=org", false }, - { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, }; + { "dc=org", "dc=com", false }, + { "dc=opendj,dc=org", "dc=foo,dc=org", false }, + { "dc=opendj,dc=org", "dc=opendj,dc=com", false }, + }; + // @formatter:on } @Test @@ -561,12 +663,16 @@ public void testHashCode(final String first, final String second, final int resu * @throws Exception * If the test failed unexpectedly. */ - @Test(dataProvider = "illegalDNs", expectedExceptions = { - LocalizedIllegalArgumentException.class, NullPointerException.class }) + @Test(dataProvider = "illegalDNs", expectedExceptions = LocalizedIllegalArgumentException.class) public void testIllegalStringDNs(final String dn) throws Exception { DN.valueOf(dn); } + @Test(dataProvider = "illegalDNs", expectedExceptions = LocalizedIllegalArgumentException.class) + public void testIllegalByteStringDNs(final String dn) throws Exception { + DN.valueOf(ByteString.valueOfUtf8(dn)); + } + /** * Test the isChildOf method. * @@ -731,8 +837,8 @@ public void testRootDN1() throws Exception { * @throws Exception * If the test failed unexpectedly. */ - @Test(expectedExceptions = { NullPointerException.class, AssertionError.class }) - public void testValueOfString() throws Exception { + @Test(expectedExceptions = NullPointerException.class) + public void valueOfStringShouldThrowNPEForNullParameter() { DN.valueOf((String) null); } @@ -742,8 +848,8 @@ public void testValueOfString() throws Exception { * @throws Exception * If the test failed unexpectedly. */ - @Test(expectedExceptions = { NullPointerException.class, AssertionError.class }) - public void testValueOfByteString() throws Exception { + @Test(expectedExceptions = NullPointerException.class) + public void valueOfByteStringShouldThrowNPEForNullParameter() throws Exception { DN.valueOf((ByteString) null); } @@ -1266,4 +1372,25 @@ public void toStringShouldStripOutIllegalWhitespace(String withWhiteSpace, Strin assertThat(DN.valueOf(withWhiteSpace).toNormalizedByteString()) .isEqualTo(DN.valueOf(withoutWhiteSpace).toNormalizedByteString()); } + + @DataProvider + public Object[][] rdnShouldReturnNullWhenIndexIsOutOfRangeData() { + return new Object[][] { + { "", 0 }, + { "", 1 }, + { "dc=com", 1 }, + { "dc=opends,dc=com", 2 }, + { "dc=hello,dc=world,dc=opends,dc=com", 4 }, + }; + } + + @Test(dataProvider = "rdnShouldReturnNullWhenIndexIsOutOfRangeData") + public void rdnShouldReturnNullWhenIndexIsOutOfRange(String rdn, int i) { + assertThat((Object) DN.valueOf(rdn).rdn(i)).isNull(); + } + + @Test(expectedExceptions = IllegalArgumentException.class) + public void rdnShouldThrowIAEForNegativeIndexes() throws Exception { + DN.valueOf("dc=example,dc=com").rdn(-1); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java index 3d59411a4..a6d6547dc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java @@ -104,19 +104,42 @@ public Object[][] createData() { */ @DataProvider(name = "illegalRDNs") public Object[][] createIllegalData() { - return new Object[][] { { null }, { "" }, { " " }, { "=" }, { "manager" }, { "manager " }, - { "cn+" }, { "cn+Jim" }, + // @formatter:off + return new Object[][] { + { null }, + { "" }, + { " " }, + { "=" }, + { "manager" }, + { "manager " }, + { "cn+" }, + { "cn+Jim" }, { "cn=Jim+" }, { "cn=Jim +" }, { "cn=Jim+ " }, + { "cn=Jim+cn=John" }, { "cn=Jim+sn" }, { "cn=Jim+sn " }, - { "cn=Jim+sn equals" }, // { "cn=Jim," }, { "cn=Jim;" }, { - // "cn=Jim, " }, - // { "cn=Jim+sn=a," }, { "cn=Jim, sn=Jam " }, { "cn+uid=Jim" }, - { "-cn=Jim" }, { "/tmp=a" }, { "\\tmp=a" }, { "cn;lang-en=Jim" }, { "@cn=Jim" }, - { "_name_=Jim" }, { "\u03c0=pi" }, { "v1.0=buggy" }, { "cn=Jim+sn=Bob++" }, - { "cn=Jim+sn=Bob+," }, { "1.3.6.1.4.1.1466..0=#04024869" }, }; + { "cn=Jim+sn equals" }, + { "cn=Jim," }, + { "cn=Jim;" }, + { "cn=Jim, " }, + { "cn=Jim+sn=a," }, + { "cn=Jim, sn=Jam " }, + { "cn+uid=Jim" }, + { "-cn=Jim" }, + { "/tmp=a" }, + { "\\tmp=a" }, + { "cn;lang-en=Jim" }, + { "@cn=Jim" }, + { "_name_=Jim" }, + { "\u03c0=pi" }, + { "v1.0=buggy" }, + { "cn=Jim+sn=Bob++" }, + { "cn=Jim+sn=Bob+," }, + { "1.3.6.1.4.1.1466..0=#04024869" }, + }; + // @formatter:on } /** @@ -142,10 +165,10 @@ public Object[][] createRDNEqualityData() { { "cn=hello+sn=world", "cn=hello+description=world", 1 }, { "cn=hello", "sn=world", -1 }, { "sn=hello", "cn=world", 1 }, - // { "x-test-integer-type=10", "x-test-integer-type=9", 1 }, - // { "x-test-integer-type=999", "x-test-integer-type=1000", -1 }, - // { "x-test-integer-type=-1", "x-test-integer-type=0", -1 }, - // { "x-test-integer-type=0", "x-test-integer-type=-1", 1 }, + { "governingStructureRule=10", "governingStructureRule=9", 1 }, + { "governingStructureRule=999", "governingStructureRule=1000", -1 }, + { "governingStructureRule=-1", "governingStructureRule=0", -1 }, + { "governingStructureRule=0", "governingStructureRule=-1", 1 }, { "cn=aaa", "cn=aaaa", -1 }, { "cn=AAA", "cn=aaaa", -1 }, { "cn=aaa", "cn=AAAA", -1 }, @@ -195,6 +218,11 @@ private RDN parseRDN(final Object value) { return (value instanceof RDN) ? ((RDN) value) : RDN.valueOf(value.toString()); } + @Test(expectedExceptions = IllegalArgumentException.class) + public void ensureRDNIsCreatedWithNonEmptyArguments() { + new RDN(); + } + /** * Test RDN construction with single AVA. * @@ -238,9 +266,9 @@ public void testConstructorWithAVA() throws Exception { @Test public void testConstructorWithMultipleAVAs() throws Exception { AVA example = new AVA("dc", "example"); - AVA org = new AVA("dc", "org"); + AVA user = new AVA("cn", "bjensen"); - final RDN rdn = new RDN(example, org); + final RDN rdn = new RDN(example, user); assertEquals(rdn.size(), 2); Iterator rdnIt = rdn.iterator(); AVA firstAva = rdnIt.next(); @@ -248,16 +276,23 @@ public void testConstructorWithMultipleAVAs() throws Exception { assertEquals(firstAva, example); AVA secondAva = rdnIt.next(); - assertEquals(secondAva.getAttributeType(), ATTR_TYPE_DC); - assertEquals(secondAva, org); + assertEquals(secondAva.getAttributeType(), ATTR_TYPE_CN); + assertEquals(secondAva, user); + } + + @Test(expectedExceptions = LocalizedIllegalArgumentException.class) + public void testConstructorWithDuplicateAVAs() { + AVA example = new AVA("dc", "example"); + AVA org = new AVA("dc", "org"); + new RDN(example, org); } @Test public void testConstructorWithCollectionOfAVAs() throws Exception { AVA example = new AVA("dc", "example"); - AVA org = new AVA("dc", "org"); + AVA user = new AVA("cn", "bjensen"); - final RDN rdn = new RDN(Arrays.asList(example, org)); + final RDN rdn = new RDN(Arrays.asList(example, user)); assertEquals(rdn.size(), 2); Iterator rdnIt = rdn.iterator(); AVA firstAva = rdnIt.next(); @@ -265,8 +300,15 @@ public void testConstructorWithCollectionOfAVAs() throws Exception { assertEquals(firstAva, example); AVA secondAva = rdnIt.next(); - assertEquals(secondAva.getAttributeType(), ATTR_TYPE_DC); - assertEquals(secondAva, org); + assertEquals(secondAva.getAttributeType(), ATTR_TYPE_CN); + assertEquals(secondAva, user); + } + + @Test(expectedExceptions = LocalizedIllegalArgumentException.class) + public void testConstructorWithCollectionOfDuplicateAVAs() { + AVA example = new AVA("dc", "example"); + AVA org = new AVA("dc", "org"); + new RDN(Arrays.asList(example, org)); } /** From 170ad71abff2d71d563a7e7bbb5908b0837dd059 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 17 Mar 2016 15:20:20 +0000 Subject: [PATCH 097/125] [maven-release-plugin] prepare release 4.0.0-M1 --- opendj-cli/pom.xml | 2 +- opendj-core/pom.xml | 2 +- opendj-doc-maven-plugin/pom.xml | 2 +- opendj-grizzly/pom.xml | 2 +- opendj-ldap-sdk-examples/pom.xml | 2 +- opendj-ldap-toolkit/pom.xml | 2 +- opendj-rest2ldap/pom.xml | 2 +- opendj-sdk-bom/pom.xml | 10 +++++++--- pom.xml | 4 ++-- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index cc2362ff9..4eeda918f 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-cli diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index 13077c4e2..69342c807 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-core diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index b60c44f15..b8ade2661 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-doc-maven-plugin diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml index d684b16ce..808c867b3 100644 --- a/opendj-grizzly/pom.xml +++ b/opendj-grizzly/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-grizzly diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index 661de1ae2..875789475 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-ldap-sdk-examples diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index b364e2111..280c08924 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-ldap-toolkit diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 4bcce5ec6..32618cabb 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-rest2ldap diff --git a/opendj-sdk-bom/pom.xml b/opendj-sdk-bom/pom.xml index b4df69b56..e1a7106fc 100644 --- a/opendj-sdk-bom/pom.xml +++ b/opendj-sdk-bom/pom.xml @@ -21,12 +21,12 @@ org.forgerock forgerock-parent 2.0.3 - + org.forgerock.opendj opendj-sdk-bom - 4.0.0-SNAPSHOT + 4.0.0-M1 pom @@ -36,7 +36,7 @@ - 4.0.0-SNAPSHOT + 4.0.0-M1 1.4.2 @@ -98,4 +98,8 @@ + + + 4.0.0-M1 +     diff --git a/pom.xml b/pom.xml index 8bb3cfe47..e050136d5 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.forgerock.opendj opendj-sdk-bom - 4.0.0-SNAPSHOT + 4.0.0-M1 opendj-sdk-bom/pom.xml @@ -62,7 +62,7 @@ https://stash.forgerock.org/projects/OPENDJ/repos/opendj-sdk/browse scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git - HEAD + 4.0.0-M1 From 8e3b733b20af917e9505ead71bb8973fd42ca2e6 Mon Sep 17 00:00:00 2001 From: jenkins Date: Thu, 17 Mar 2016 15:20:21 +0000 Subject: [PATCH 098/125] [maven-release-plugin] prepare for next development iteration --- opendj-cli/pom.xml | 2 +- opendj-core/pom.xml | 2 +- opendj-doc-maven-plugin/pom.xml | 2 +- opendj-grizzly/pom.xml | 2 +- opendj-ldap-sdk-examples/pom.xml | 2 +- opendj-ldap-toolkit/pom.xml | 2 +- opendj-rest2ldap/pom.xml | 2 +- opendj-sdk-bom/pom.xml | 8 ++------ pom.xml | 4 ++-- 9 files changed, 11 insertions(+), 15 deletions(-) diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index 4eeda918f..cc2362ff9 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-cli diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index 69342c807..13077c4e2 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-core diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index b8ade2661..b60c44f15 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-doc-maven-plugin diff --git a/opendj-grizzly/pom.xml b/opendj-grizzly/pom.xml index 808c867b3..d684b16ce 100644 --- a/opendj-grizzly/pom.xml +++ b/opendj-grizzly/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-grizzly diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index 875789475..661de1ae2 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-ldap-sdk-examples diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index 280c08924..b364e2111 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-ldap-toolkit diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 32618cabb..4bcce5ec6 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -20,7 +20,7 @@ opendj-sdk-parent org.forgerock.opendj - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-rest2ldap diff --git a/opendj-sdk-bom/pom.xml b/opendj-sdk-bom/pom.xml index e1a7106fc..7f5d35a3d 100644 --- a/opendj-sdk-bom/pom.xml +++ b/opendj-sdk-bom/pom.xml @@ -26,7 +26,7 @@ org.forgerock.opendj opendj-sdk-bom - 4.0.0-M1 + 4.0.0-SNAPSHOT pom @@ -36,7 +36,7 @@ - 4.0.0-M1 + 4.0.0-SNAPSHOT 1.4.2 @@ -98,8 +98,4 @@ - - - 4.0.0-M1 -     diff --git a/pom.xml b/pom.xml index e050136d5..8bb3cfe47 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.forgerock.opendj opendj-sdk-bom - 4.0.0-M1 + 4.0.0-SNAPSHOT opendj-sdk-bom/pom.xml @@ -62,7 +62,7 @@ https://stash.forgerock.org/projects/OPENDJ/repos/opendj-sdk/browse scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git scm:git:ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git - 4.0.0-M1 + HEAD From 35f6bddba7833335a4c9439d3494a2ba30b44afd Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Thu, 17 Mar 2016 17:33:53 +0100 Subject: [PATCH 099/125] Fix NPE in opendj-doc-maven-plugin --- .../forgerock/opendj/maven/doc/GenerateMessageFileMojo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java index c771d927f..363e71937 100644 --- a/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java +++ b/opendj-doc-maven-plugin/src/main/java/org/forgerock/opendj/maven/doc/GenerateMessageFileMojo.java @@ -274,8 +274,10 @@ public String toString() { public int compareTo(MessagePropertyKey k) { if (ordinal == k.ordinal) { return description.compareTo(k.description); - } else { + } else if (ordinal != null && k.ordinal != null) { return ordinal.compareTo(k.ordinal); + } else { + return 0; } } } From 9f0598743291f0529a573e2588e6de4288082f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Wed, 23 Mar 2016 13:49:30 +0100 Subject: [PATCH 100/125] Added SchemaConstants.NO_ATTRIBUTES Reduced vertical spacing for the whole file and grouped linked fields together. --- .../opendj/ldap/schema/SchemaConstants.java | 1324 ++++------------- 1 file changed, 292 insertions(+), 1032 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java index eb59b39fc..c8c94113c 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java @@ -13,7 +13,7 @@ * * Copyright 2006-2009 Sun Microsystems, Inc. * Portions Copyright 2014 Manuel Gaupp - * Portions Copyright 2015 ForgeRock AS. + * Portions Copyright 2015-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -25,53 +25,32 @@ */ final class SchemaConstants { /** - * The IANA-assigned base OID for all things under the OpenDS umbrella. + * RFC 2251, Section 4.5.1: 'If the client does not want any attributes returned, + * it can specify a list containing only the attribute with OID "1.1". + * This OID was chosen arbitrarily and does not correspond to any attribute in use.' + * + * @see RFC 2251 for LDAP v3 */ + public static final String NO_ATTRIBUTES = "1.1"; + + /** The IANA-assigned base OID for all things under the OpenDS umbrella. */ public static final String OID_OPENDS_BASE = "1.3.6.1.4.1.26027"; - /** - * The base OID that will be used for the OpenDS Directory Server project. - */ + /** The base OID that will be used for the OpenDS Directory Server project. */ public static final String OID_OPENDS_SERVER_BASE = OID_OPENDS_BASE + ".1"; - /** - * The base OID that will be used for OpenDS Directory Server attribute type - * definitions. - */ - public static final String OID_OPENDS_SERVER_ATTRIBUTE_TYPE_BASE = OID_OPENDS_SERVER_BASE - + ".1"; - - /** - * The base OID that will be used for OpenDS Directory Server object class - * definitions. - */ + /** The base OID that will be used for OpenDS Directory Server attribute type definitions. */ + public static final String OID_OPENDS_SERVER_ATTRIBUTE_TYPE_BASE = OID_OPENDS_SERVER_BASE + ".1"; + /** The base OID that will be used for OpenDS Directory Server object class definitions. */ public static final String OID_OPENDS_SERVER_OBJECT_CLASS_BASE = OID_OPENDS_SERVER_BASE + ".2"; - - /** - * The base OID that will be used for OpenDS Directory Server attribute - * syntax definitions. - */ - public static final String OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE = OID_OPENDS_SERVER_BASE - + ".3"; - - /** - * The base OID that will be used for OpenDS Directory Server matching rule - * definitions. - */ + /** The base OID that will be used for OpenDS Directory Server attribute syntax definitions. */ + public static final String OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE = OID_OPENDS_SERVER_BASE + ".3"; + /** The base OID that will be used for OpenDS Directory Server matching rule definitions. */ public static final String OID_OPENDS_SERVER_MATCHING_RULE_BASE = OID_OPENDS_SERVER_BASE + ".4"; - - /** - * The base OID that will be used for OpenDS Directory Server control - * definitions. - */ + /** The base OID that will be used for OpenDS Directory Server control definitions. */ public static final String OID_OPENDS_SERVER_CONTROL_BASE = OID_OPENDS_SERVER_BASE + ".5"; - - /** - * The base OID that will be used for OpenDS Directory Server extended - * operation definitions. - */ - public static final String OID_OPENDS_SERVER_EXTENDED_OPERATION_BASE = OID_OPENDS_SERVER_BASE - + ".6"; + /** The base OID that will be used for OpenDS Directory Server extended operation definitions. */ + public static final String OID_OPENDS_SERVER_EXTENDED_OPERATION_BASE = OID_OPENDS_SERVER_BASE + ".6"; /** * The base OID that will be used for general-purpose (i.e., "other") types @@ -83,1365 +62,664 @@ final class SchemaConstants { * The base OID that will be used for temporary or experimental OIDs within * the OpenDS Directory Server. */ - public static final String OID_OPENDS_SERVER_EXPERIMENTAL_BASE = OID_OPENDS_SERVER_BASE - + ".999"; + public static final String OID_OPENDS_SERVER_EXPERIMENTAL_BASE = OID_OPENDS_SERVER_BASE + ".999"; - /** - * The description for the doubleMetaphoneApproximateMatch approximate - * matching rule. - */ + /** The description for the doubleMetaphoneApproximateMatch approximate matching rule. */ public static final String AMR_DOUBLE_METAPHONE_DESCRIPTION = "Double Metaphone Approximate Match"; - - /** - * The name for the doubleMetaphoneApproximateMatch approximate matching - * rule. - */ + /** The name for the doubleMetaphoneApproximateMatch approximate matching rule. */ public static final String AMR_DOUBLE_METAPHONE_NAME = "ds-mr-double-metaphone-approx"; + /** The OID for the doubleMetaphoneApproximateMatch approximate matching rule. */ + public static final String AMR_DOUBLE_METAPHONE_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".1"; - /** - * The OID for the doubleMetaphoneApproximateMatch approximate matching - * rule. - */ - public static final String AMR_DOUBLE_METAPHONE_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE - + ".1"; - - /** - * The description for the authPasswordExactMatch matching rule. - */ + /** The description for the authPasswordExactMatch matching rule. */ public static final String EMR_AUTH_PASSWORD_EXACT_DESCRIPTION = "authentication password exact matching rule"; - - /** - * The name for the authPasswordExactMatch equality matching rule. - */ + /** The name for the authPasswordExactMatch equality matching rule. */ public static final String EMR_AUTH_PASSWORD_EXACT_NAME = "authPasswordExactMatch"; - - /** - * The OID for the authPasswordExactMatch equality matching rule. - */ + /** The OID for the authPasswordExactMatch equality matching rule. */ public static final String EMR_AUTH_PASSWORD_EXACT_OID = "1.3.6.1.4.1.4203.1.2.2"; - - /** - * The description for the authPasswordMatch matching rule. - */ + /** The description for the authPasswordMatch matching rule. */ public static final String EMR_AUTH_PASSWORD_DESCRIPTION = "authentication password matching rule"; - /** - * The name for the authPasswordMatch equality matching rule. - */ + /** The name for the authPasswordMatch equality matching rule. */ public static final String EMR_AUTH_PASSWORD_NAME = "authPasswordMatch"; - - /** - * The OID for the authPasswordMatch equality matching rule. - */ + /** The OID for the authPasswordMatch equality matching rule. */ public static final String EMR_AUTH_PASSWORD_OID = "1.3.6.1.4.1.4203.1.2.3"; - /** - * The name for the bitStringMatch equality matching rule. - */ + /** The name for the bitStringMatch equality matching rule. */ public static final String EMR_BIT_STRING_NAME = "bitStringMatch"; - - /** - * The OID for the bitStringMatch equality matching rule. - */ + /** The OID for the bitStringMatch equality matching rule. */ public static final String EMR_BIT_STRING_OID = "2.5.13.16"; - /** - * The name for the booleanMatch equality matching rule. - */ + /** The name for the booleanMatch equality matching rule. */ public static final String EMR_BOOLEAN_NAME = "booleanMatch"; - - /** - * The OID for the booleanMatch equality matching rule. - */ + /** The OID for the booleanMatch equality matching rule. */ public static final String EMR_BOOLEAN_OID = "2.5.13.13"; - /** - * The name for the caseExactMatch equality matching rule. - */ + /** The name for the caseExactMatch equality matching rule. */ public static final String EMR_CASE_EXACT_NAME = "caseExactMatch"; - - /** - * The OID for the caseExactMatch equality matching rule. - */ + /** The OID for the caseExactMatch equality matching rule. */ public static final String EMR_CASE_EXACT_OID = "2.5.13.5"; - /** - * The name for the caseExactIA5Match equality matching rule. - */ + /** The name for the caseExactIA5Match equality matching rule. */ public static final String EMR_CASE_EXACT_IA5_NAME = "caseExactIA5Match"; - - /** - * The OID for the caseExactIA5Match equality matching rule. - */ + /** The OID for the caseExactIA5Match equality matching rule. */ public static final String EMR_CASE_EXACT_IA5_OID = "1.3.6.1.4.1.1466.109.114.1"; - /** - * The name for the caseIgnoreMatch equality matching rule. - */ + /** The name for the caseIgnoreMatch equality matching rule. */ public static final String EMR_CASE_IGNORE_NAME = "caseIgnoreMatch"; - - /** - * The OID for the caseIgnoreMatch equality matching rule. - */ + /** The OID for the caseIgnoreMatch equality matching rule. */ public static final String EMR_CASE_IGNORE_OID = "2.5.13.2"; - /** - * The name for the caseIgnoreIA5Match equality matching rule. - */ + /** The name for the caseIgnoreIA5Match equality matching rule. */ public static final String EMR_CASE_IGNORE_IA5_NAME = "caseIgnoreIA5Match"; - - /** - * The OID for the caseIgnoreIA5Match equality matching rule. - */ + /** The OID for the caseIgnoreIA5Match equality matching rule. */ public static final String EMR_CASE_IGNORE_IA5_OID = "1.3.6.1.4.1.1466.109.114.2"; - /** - * The name for the caseIgnoreListMatch equality matching rule. - */ + /** The name for the caseIgnoreListMatch equality matching rule. */ public static final String EMR_CASE_IGNORE_LIST_NAME = "caseIgnoreListMatch"; - - /** - * The OID for the caseIgnoreListMatch equality matching rule. - */ + /** The OID for the caseIgnoreListMatch equality matching rule. */ public static final String EMR_CASE_IGNORE_LIST_OID = "2.5.13.11"; - /** - * The name for the certificateExactMatch equality matching rule. - */ + /** The name for the certificateExactMatch equality matching rule. */ public static final String EMR_CERTIFICATE_EXACT_NAME = "certificateExactMatch"; - - /** - * The OID for the certificateExactMatch equality matching rule. - */ + /** The OID for the certificateExactMatch equality matching rule. */ public static final String EMR_CERTIFICATE_EXACT_OID = "2.5.13.34"; - /** - * The name for the directoryStringFirstComponentMatch equality matching - * rule. - */ + /** The name for the directoryStringFirstComponentMatch equality matching rule. */ public static final String EMR_DIRECTORY_STRING_FIRST_COMPONENT_NAME = "directoryStringFirstComponentMatch"; - - /** - * The OID for the directoryStringFirstComponentMatch equality matching - * rule. - */ + /** The OID for the directoryStringFirstComponentMatch equality matching rule. */ public static final String EMR_DIRECTORY_STRING_FIRST_COMPONENT_OID = "2.5.13.31"; - /** - * The name for the distinguishedNameMatch equality matching rule. - */ + /** The name for the distinguishedNameMatch equality matching rule. */ public static final String EMR_DN_NAME = "distinguishedNameMatch"; - - /** - * The OID for the distinguishedNameMatch equality matching rule. - */ + /** The OID for the distinguishedNameMatch equality matching rule. */ public static final String EMR_DN_OID = "2.5.13.1"; - /** - * The name for the generalizedTimeMatch equality matching rule. - */ + /** The name for the generalizedTimeMatch equality matching rule. */ public static final String EMR_GENERALIZED_TIME_NAME = "generalizedTimeMatch"; - - /** - * The OID for the generalizedTimeMatch equality matching rule. - */ + /** The OID for the generalizedTimeMatch equality matching rule. */ public static final String EMR_GENERALIZED_TIME_OID = "2.5.13.27"; - /** - * The name for the integerMatch equality matching rule. - */ + /** The name for the integerMatch equality matching rule. */ public static final String EMR_INTEGER_NAME = "integerMatch"; - - /** - * The OID for the integerMatch equality matching rule. - */ + /** The OID for the integerMatch equality matching rule. */ public static final String EMR_INTEGER_OID = "2.5.13.14"; - /** - * The name for the integerFirstComponentMatch equality matching rule. - */ + /** The name for the integerFirstComponentMatch equality matching rule. */ public static final String EMR_INTEGER_FIRST_COMPONENT_NAME = "integerFirstComponentMatch"; - - /** - * The OID for the integerFirstComponentMatch equality matching rule. - */ + /** The OID for the integerFirstComponentMatch equality matching rule. */ public static final String EMR_INTEGER_FIRST_COMPONENT_OID = "2.5.13.29"; - /** - * The name for the keywordMatch equality matching rule. - */ + /** The name for the keywordMatch equality matching rule. */ public static final String EMR_KEYWORD_NAME = "keywordMatch"; - - /** - * The OID for the keywordMatch equality matching rule. - */ + /** The OID for the keywordMatch equality matching rule. */ public static final String EMR_KEYWORD_OID = "2.5.13.33"; - /** - * The name for the numericStringMatch equality matching rule. - */ + /** The name for the numericStringMatch equality matching rule. */ public static final String EMR_NUMERIC_STRING_NAME = "numericStringMatch"; - - /** - * The OID for the numericStringMatch equality matching rule. - */ + /** The OID for the numericStringMatch equality matching rule. */ public static final String EMR_NUMERIC_STRING_OID = "2.5.13.8"; - /** - * The name for the octetStringMatch equality matching rule. - */ + /** The name for the octetStringMatch equality matching rule. */ public static final String EMR_OCTET_STRING_NAME = "octetStringMatch"; - - /** - * The OID for the octetStringMatch equality matching rule. - */ + /** The OID for the octetStringMatch equality matching rule. */ public static final String EMR_OCTET_STRING_OID = "2.5.13.17"; - /** - * The name for the objectIdentifierMatch equality matching rule. - */ + /** The name for the objectIdentifierMatch equality matching rule. */ public static final String EMR_OID_NAME = "objectIdentifierMatch"; - - /** - * The OID for the objectIdentifierMatch equality matching rule. - */ + /** The OID for the objectIdentifierMatch equality matching rule. */ public static final String EMR_OID_OID = "2.5.13.0"; - /** - * The name for the objectIdentifierFirstComponentMatch equality matching - * rule. - */ + /** The name for the objectIdentifierFirstComponentMatch equality matching rule. */ public static final String EMR_OID_FIRST_COMPONENT_NAME = "objectIdentifierFirstComponentMatch"; - - /** - * The OID for the objectIdentifierFirstComponentMatch equality matching - * rule. - */ + /** The OID for the objectIdentifierFirstComponentMatch equality matching rule. */ public static final String EMR_OID_FIRST_COMPONENT_OID = "2.5.13.30"; - /** - * The name for the presentationAddressMatch equality matching rule. - */ + /** The name for the presentationAddressMatch equality matching rule. */ public static final String EMR_PRESENTATION_ADDRESS_NAME = "presentationAddressMatch"; - - /** - * The OID for the presentationAddressMatch equality matching rule. - */ + /** The OID for the presentationAddressMatch equality matching rule. */ public static final String EMR_PRESENTATION_ADDRESS_OID = "2.5.13.22"; - /** - * The name for the protocolInformationMatch equality matching rule. - */ + /** The name for the protocolInformationMatch equality matching rule. */ public static final String EMR_PROTOCOL_INFORMATION_NAME = "protocolInformationMatch"; - - /** - * The OID for the protocolInformationMatch equality matching rule. - */ + /** The OID for the protocolInformationMatch equality matching rule. */ public static final String EMR_PROTOCOL_INFORMATION_OID = "2.5.13.24"; - /** - * The name for the telephoneNumberMatch equality matching rule. - */ + /** The name for the telephoneNumberMatch equality matching rule. */ public static final String EMR_TELEPHONE_NAME = "telephoneNumberMatch"; - - /** - * The OID for the telephoneNumberMatch equality matching rule. - */ + /** The OID for the telephoneNumberMatch equality matching rule. */ public static final String EMR_TELEPHONE_OID = "2.5.13.20"; - /** - * The name for the uniqueMemberMatch equality matching rule. - */ + /** The name for the uniqueMemberMatch equality matching rule. */ public static final String EMR_UNIQUE_MEMBER_NAME = "uniqueMemberMatch"; - - /** - * The OID for the uniqueMemberMatch equality matching rule. - */ + /** The OID for the uniqueMemberMatch equality matching rule. */ public static final String EMR_UNIQUE_MEMBER_OID = "2.5.13.23"; - /** - * The description for the userPasswordExactMatch matching rule. - */ + /** The description for the userPasswordExactMatch matching rule. */ public static final String EMR_USER_PASSWORD_EXACT_DESCRIPTION = "user password exact matching rule"; - - /** - * The name for the userPasswordExactMatch equality matching rule. - */ + /** The name for the userPasswordExactMatch equality matching rule. */ public static final String EMR_USER_PASSWORD_EXACT_NAME = "ds-mr-user-password-exact"; + /** The OID for the userPasswordExactMatch equality matching rule. */ + public static final String EMR_USER_PASSWORD_EXACT_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".2"; - /** - * The OID for the userPasswordExactMatch equality matching rule. - */ - public static final String EMR_USER_PASSWORD_EXACT_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE - + ".2"; - - /** - * The description for the userPasswordMatch matching rule. - */ + /** The description for the userPasswordMatch matching rule. */ public static final String EMR_USER_PASSWORD_DESCRIPTION = "user password matching rule"; - - /** - * The name for the userPasswordMatch equality matching rule. - */ + /** The name for the userPasswordMatch equality matching rule. */ public static final String EMR_USER_PASSWORD_NAME = "ds-mr-user-password-equality"; - - /** - * The OID for the userPasswordMatch equality matching rule. - */ + /** The OID for the userPasswordMatch equality matching rule. */ public static final String EMR_USER_PASSWORD_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".3"; - /** - * The name for the uuidMatch equality matching rule. - */ + /** The name for the uuidMatch equality matching rule. */ public static final String EMR_UUID_NAME = "uuidMatch"; - - /** - * The OID for the uuidMatch equality matching rule. - */ + /** The OID for the uuidMatch equality matching rule. */ public static final String EMR_UUID_OID = "1.3.6.1.1.16.2"; - /** - * The name for the wordMatch equality matching rule. - */ + /** The name for the wordMatch equality matching rule. */ public static final String EMR_WORD_NAME = "wordMatch"; - - /** - * The OID for the wordMatch equality matching rule. - */ + /** The OID for the wordMatch equality matching rule. */ public static final String EMR_WORD_OID = "2.5.13.32"; - /** - * The Description for the partialDateAndTimeMatchingRule ordering matching rule. - */ + /** The Description for the partialDateAndTimeMatchingRule ordering matching rule. */ public static final String MR_PARTIAL_DATE_AND_TIME_DESCRIPTION = "partial date and time matching"; - - /** - * The Name for the partialDateAndTimeMatchingRule ordering matching rule. - */ + /** The Name for the partialDateAndTimeMatchingRule ordering matching rule. */ public static final String MR_PARTIAL_DATE_AND_TIME_NAME = "partialDateAndTimeMatchingRule"; - - /** - * The OID for the partialDateAndTimeMatchingRule ordering matching rule. - */ + /** The OID for the partialDateAndTimeMatchingRule ordering matching rule. */ public static final String MR_PARTIAL_DATE_AND_TIME_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".7"; - /** - * The name for the caseExactOrderingMatch ordering matching rule. - */ + /** The name for the caseExactOrderingMatch ordering matching rule. */ public static final String OMR_CASE_EXACT_NAME = "caseExactOrderingMatch"; - - /** - * The OID for the caseExactOrderingMatch ordering matching rule. - */ + /** The OID for the caseExactOrderingMatch ordering matching rule. */ public static final String OMR_CASE_EXACT_OID = "2.5.13.6"; - /** - * The name for the caseIgnoreOrderingMatch ordering matching rule. - */ + /** The name for the caseIgnoreOrderingMatch ordering matching rule. */ public static final String OMR_CASE_IGNORE_NAME = "caseIgnoreOrderingMatch"; - - /** - * The OID for the caseIgnoreOrderingMatch ordering matching rule. - */ + /** The OID for the caseIgnoreOrderingMatch ordering matching rule. */ public static final String OMR_CASE_IGNORE_OID = "2.5.13.3"; - /** - * The name for the generalizedTimeOrderingMatch ordering matching rule. - */ + /** The name for the generalizedTimeOrderingMatch ordering matching rule. */ public static final String OMR_GENERALIZED_TIME_NAME = "generalizedTimeOrderingMatch"; - - /** - * The OID for the generalizedTimeOrderingMatch ordering matching rule. - */ + /** The OID for the generalizedTimeOrderingMatch ordering matching rule. */ public static final String OMR_GENERALIZED_TIME_OID = "2.5.13.28"; - /** - * The name for the integerOrderingMatch ordering matching rule. - */ + /** The name for the integerOrderingMatch ordering matching rule. */ public static final String OMR_INTEGER_NAME = "integerOrderingMatch"; - - /** - * The OID for the integerOrderingMatch ordering matching rule. - */ + /** The OID for the integerOrderingMatch ordering matching rule. */ public static final String OMR_INTEGER_OID = "2.5.13.15"; - /** - * The name for the numericStringOrderingMatch ordering matching rule. - */ + /** The name for the numericStringOrderingMatch ordering matching rule. */ public static final String OMR_NUMERIC_STRING_NAME = "numericStringOrderingMatch"; - - /** - * The OID for the numericStringOrderingMatch ordering matching rule. - */ + /** The OID for the numericStringOrderingMatch ordering matching rule. */ public static final String OMR_NUMERIC_STRING_OID = "2.5.13.9"; - /** - * The name for the octetStringOrderingMatch ordering matching rule. - */ + /** The name for the octetStringOrderingMatch ordering matching rule. */ public static final String OMR_OCTET_STRING_NAME = "octetStringOrderingMatch"; - - /** - * The OID for the octetStringOrderingMatch ordering matching rule. - */ + /** The OID for the octetStringOrderingMatch ordering matching rule. */ public static final String OMR_OCTET_STRING_OID = "2.5.13.18"; - /** - * The Description for the relativeTimeGreaterThan ordering matching rule. - */ + /** The Description for the relativeTimeGreaterThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_GREATER_THAN_DESCRIPTION = "greater-than relative time for time-based searches"; - - /** - * The Name for the relativeTimeGreaterThan ordering matching rule. - */ + /** The Name for the relativeTimeGreaterThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_GREATER_THAN_NAME = "relativeTimeGTOrderingMatch"; - - /** - * The alternative name for the relativeTimeGreaterThan ordering matching rule. - */ + /** The alternative name for the relativeTimeGreaterThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_GREATER_THAN_ALT_NAME = "relativeTimeOrderingMatch.gt"; - - /** - * The OID for the relativeTimeGreaterThan ordering matching rule. - */ + /** The OID for the relativeTimeGreaterThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_GREATER_THAN_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".5"; - /** - * The Description for the relativeTimeLessThan ordering matching rule. - */ + /** The Description for the relativeTimeLessThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_LESS_THAN_DESCRIPTION = "less-than relative time for time-based searches"; - - /** - * The Name for the relativeTimeLessThan ordering matching rule. - */ + /** The Name for the relativeTimeLessThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_LESS_THAN_NAME = "relativeTimeLTOrderingMatch"; - - /** - * The alternative name for the relativeTimeLessThan ordering matching rule. - */ + /** The alternative name for the relativeTimeLessThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_LESS_THAN_ALT_NAME = "relativeTimeOrderingMatch.lt"; - - /** - * The OID for the relativeTimeLessThan ordering matching rule. - */ + /** The OID for the relativeTimeLessThan ordering matching rule. */ public static final String OMR_RELATIVE_TIME_LESS_THAN_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".6"; - /** - * The name for the uuidOrderingMatch ordering matching rule. - */ + /** The name for the uuidOrderingMatch ordering matching rule. */ public static final String OMR_UUID_NAME = "uuidOrderingMatch"; - - /** - * The OID for the uuidOrderingMatch ordering matching rule. - */ + /** The OID for the uuidOrderingMatch ordering matching rule. */ public static final String OMR_UUID_OID = "1.3.6.1.1.16.3"; - /** - * The name for the enumOrderingMatch ordering matching rule. - */ + /** The name for the enumOrderingMatch ordering matching rule. */ public static final String OMR_GENERIC_ENUM_NAME = "enumOrderingMatch"; - - /** - * The oid for the generic enum syntax ordering matching rule. - */ + /** The oid for the generic enum syntax ordering matching rule. */ public static final String OMR_OID_GENERIC_ENUM = "1.3.6.1.4.1.26027.1.4.8"; - /** - * The name for the caseExactSubstringsMatch substring matching rule. - */ + /** The name for the caseExactSubstringsMatch substring matching rule. */ public static final String SMR_CASE_EXACT_NAME = "caseExactSubstringsMatch"; - - /** - * The OID for the caseExactSubstringsMatch substring matching rule. - */ + /** The OID for the caseExactSubstringsMatch substring matching rule. */ public static final String SMR_CASE_EXACT_OID = "2.5.13.7"; - /** - * The name for the caseExactIA5SubstringsMatch substring matching rule. - */ + /** The name for the caseExactIA5SubstringsMatch substring matching rule. */ public static final String SMR_CASE_EXACT_IA5_NAME = "caseExactIA5SubstringsMatch"; - /** * The OID for the caseExactIA5SubstringsMatch substring matching rule. // * FIXME -- This needs to be updated once a real OID is assigned. */ - public static final String SMR_CASE_EXACT_IA5_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE - + ".902"; + public static final String SMR_CASE_EXACT_IA5_OID = OID_OPENDS_SERVER_MATCHING_RULE_BASE + ".902"; - /** - * The name for the caseIgnoreSubstringsMatch substring matching rule. - */ + /** The name for the caseIgnoreSubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_NAME = "caseIgnoreSubstringsMatch"; - - /** - * The OID for the caseIgnoreSubstringsMatch substring matching rule. - */ + /** The OID for the caseIgnoreSubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_OID = "2.5.13.4"; - /** - * The name for the caseIgnoreIA5SubstringsMatch substring matching rule. - */ + /** The name for the caseIgnoreIA5SubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_IA5_NAME = "caseIgnoreIA5SubstringsMatch"; - - /** - * The OID for the caseIgnoreIA5SubstringsMatch substring matching rule. - */ + /** The OID for the caseIgnoreIA5SubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_IA5_OID = "1.3.6.1.4.1.1466.109.114.3"; - /** - * The name for the caseIgnoreListSubstringsMatch substring matching rule. - */ + /** The name for the caseIgnoreListSubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_LIST_NAME = "caseIgnoreListSubstringsMatch"; - - /** - * The OID for the caseIgnoreListSubstringsMatch substring matching rule. - */ + /** The OID for the caseIgnoreListSubstringsMatch substring matching rule. */ public static final String SMR_CASE_IGNORE_LIST_OID = "2.5.13.12"; - /** - * The name for the numericStringSubstringsMatch substring matching rule. - */ + /** The name for the numericStringSubstringsMatch substring matching rule. */ public static final String SMR_NUMERIC_STRING_NAME = "numericStringSubstringsMatch"; - - /** - * The OID for the numericStringSubstringsMatch substring matching rule. - */ + /** The OID for the numericStringSubstringsMatch substring matching rule. */ public static final String SMR_NUMERIC_STRING_OID = "2.5.13.10"; - /** - * The name for the octetStringSubstringsMatch substring matching rule. - */ + /** The name for the octetStringSubstringsMatch substring matching rule. */ public static final String SMR_OCTET_STRING_NAME = "octetStringSubstringsMatch"; - - /** - * The OID for the octetStringSubstringsMatch substring matching rule. - */ + /** The OID for the octetStringSubstringsMatch substring matching rule. */ public static final String SMR_OCTET_STRING_OID = "2.5.13.19"; - /** - * The name for the telephoneNumberSubstringsMatch substring matching rule. - */ + /** The name for the telephoneNumberSubstringsMatch substring matching rule. */ public static final String SMR_TELEPHONE_NAME = "telephoneNumberSubstringsMatch"; - - /** - * The OID for the telephoneNumberSubstringsMatch substring matching rule. - */ + /** The OID for the telephoneNumberSubstringsMatch substring matching rule. */ public static final String SMR_TELEPHONE_OID = "2.5.13.21"; - /** - * The OID for the absolute subtree specification attribute syntax. - */ + /** The OID for the absolute subtree specification attribute syntax. */ public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_OID = OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE + ".3"; - - /** - * The description for the absolute subtree specification attribute syntax. - */ + /** The description for the absolute subtree specification attribute syntax. */ public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_DESCRIPTION = "Absolute Subtree Specification"; - - /** - * The name for the absolute subtree specification attribute syntax. - */ + /** The name for the absolute subtree specification attribute syntax. */ public static final String SYNTAX_ABSOLUTE_SUBTREE_SPECIFICATION_NAME = "ds-absolute-subtree-specification"; - /** - * The OID for the aci attribute syntax. - */ + /** The OID for the aci attribute syntax. */ public static final String SYNTAX_ACI_OID = OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE + ".4"; - - /** - * The description for aci attribute syntax. - */ + /** The description for aci attribute syntax. */ public static final String SYNTAX_ACI_DESCRIPTION = "Sun-defined Access Control Information"; - - /** - * The name for the aci attribute syntax. - */ + /** The name for the aci attribute syntax. */ public static final String SYNTAX_ACI_NAME = "ds-syntax-dseecompat-aci"; - /** - * The description for the attribute type description attribute syntax. - */ + /** The description for the attribute type description attribute syntax. */ public static final String SYNTAX_ATTRIBUTE_TYPE_DESCRIPTION = "Attribute Type Description"; - - /** - * The name for the attribute type description attribute syntax. - */ + /** The name for the attribute type description attribute syntax. */ public static final String SYNTAX_ATTRIBUTE_TYPE_NAME = "AttributeTypeDescription"; - - /** - * The OID for the attribute type description attribute syntax. - */ + /** The OID for the attribute type description attribute syntax. */ public static final String SYNTAX_ATTRIBUTE_TYPE_OID = "1.3.6.1.4.1.1466.115.121.1.3"; - /** - * The description for the auth password attribute syntax. - */ + /** The description for the auth password attribute syntax. */ public static final String SYNTAX_AUTH_PASSWORD_DESCRIPTION = "Authentication Password Syntax"; - - /** - * The name for the auth password attribute syntax. - */ + /** The name for the auth password attribute syntax. */ public static final String SYNTAX_AUTH_PASSWORD_NAME = "AuthenticationPasswordSyntax"; - - /** - * The OID for the auth password attribute syntax. - */ + /** The OID for the auth password attribute syntax. */ public static final String SYNTAX_AUTH_PASSWORD_OID = "1.3.6.1.4.1.4203.1.1.2"; - /** - * The description for the binary attribute syntax. - */ + /** The description for the binary attribute syntax. */ public static final String SYNTAX_BINARY_DESCRIPTION = "Binary"; - - /** - * The name for the binary attribute syntax. - */ + /** The name for the binary attribute syntax. */ public static final String SYNTAX_BINARY_NAME = "Binary"; - - /** - * The OID for the binary attribute syntax. - */ + /** The OID for the binary attribute syntax. */ public static final String SYNTAX_BINARY_OID = "1.3.6.1.4.1.1466.115.121.1.5"; - /** - * The description for the bit string attribute syntax. - */ + /** The description for the bit string attribute syntax. */ public static final String SYNTAX_BIT_STRING_DESCRIPTION = "Bit String"; - - /** - * The name for the bit string attribute syntax. - */ + /** The name for the bit string attribute syntax. */ public static final String SYNTAX_BIT_STRING_NAME = "BitString"; - - /** - * The OID for the bit string attribute syntax. - */ + /** The OID for the bit string attribute syntax. */ public static final String SYNTAX_BIT_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.6"; - /** - * The description for the Boolean attribute syntax. - */ + /** The description for the Boolean attribute syntax. */ public static final String SYNTAX_BOOLEAN_DESCRIPTION = "Boolean"; - - /** - * The name for the Boolean attribute syntax. - */ + /** The name for the Boolean attribute syntax. */ public static final String SYNTAX_BOOLEAN_NAME = "Boolean"; - - /** - * The OID for the Boolean attribute syntax. - */ + /** The OID for the Boolean attribute syntax. */ public static final String SYNTAX_BOOLEAN_OID = "1.3.6.1.4.1.1466.115.121.1.7"; - /** - * The description for the certificate attribute syntax. - */ + /** The description for the certificate attribute syntax. */ public static final String SYNTAX_CERTIFICATE_DESCRIPTION = "Certificate"; - - /** - * The name for the certificate attribute syntax. - */ + /** The name for the certificate attribute syntax. */ public static final String SYNTAX_CERTIFICATE_NAME = "Certificate"; - - /** - * The OID for the certificate attribute syntax. - */ + /** The OID for the certificate attribute syntax. */ public static final String SYNTAX_CERTIFICATE_OID = "1.3.6.1.4.1.1466.115.121.1.8"; - /** - * The description for the certificate exact assertion attribute syntax. - */ + /** The description for the certificate exact assertion attribute syntax. */ public static final String SYNTAX_CERTIFICATE_EXACT_ASSERTION_DESCRIPTION = "X.509 Certificate Exact Assertion"; - - /** - * The name for the certificate exact assertion attribute syntax. - */ + /** The name for the certificate exact assertion attribute syntax. */ public static final String SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME = "CertificateExactAssertion"; - /** * The OID for the Certificate Exact Assertion syntax used for assertion * values in extensible match filters. */ public static final String SYNTAX_CERTIFICATE_EXACT_ASSERTION_OID = "1.3.6.1.1.15.1"; - /** - * The description for the certificate list attribute syntax. - */ + /** The description for the certificate list attribute syntax. */ public static final String SYNTAX_CERTLIST_DESCRIPTION = "Certificate List"; - - /** - * The name for the certificate list attribute syntax. - */ + /** The name for the certificate list attribute syntax. */ public static final String SYNTAX_CERTLIST_NAME = "CertificateList"; - - /** - * The OID for the certificate list attribute syntax. - */ + /** The OID for the certificate list attribute syntax. */ public static final String SYNTAX_CERTLIST_OID = "1.3.6.1.4.1.1466.115.121.1.9"; - /** - * The description for the certificate pair attribute syntax. - */ + /** The description for the certificate pair attribute syntax. */ public static final String SYNTAX_CERTPAIR_DESCRIPTION = "Certificate Pair"; - - /** - * The name for the certificate pair attribute syntax. - */ + /** The name for the certificate pair attribute syntax. */ public static final String SYNTAX_CERTPAIR_NAME = "CertificatePair"; - - /** - * The OID for the certificate pair attribute syntax. - */ + /** The OID for the certificate pair attribute syntax. */ public static final String SYNTAX_CERTPAIR_OID = "1.3.6.1.4.1.1466.115.121.1.10"; - /** - * The description for the country string attribute syntax. - */ + /** The description for the country string attribute syntax. */ public static final String SYNTAX_COUNTRY_STRING_DESCRIPTION = "Country String"; - - /** - * The name for the country string attribute syntax. - */ + /** The name for the country string attribute syntax. */ public static final String SYNTAX_COUNTRY_STRING_NAME = "CountryString"; - - /** - * The OID for the country string attribute syntax. - */ + /** The OID for the country string attribute syntax. */ public static final String SYNTAX_COUNTRY_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.11"; - /** - * The description for the delivery method attribute syntax. - */ + /** The description for the delivery method attribute syntax. */ public static final String SYNTAX_DELIVERY_METHOD_DESCRIPTION = "Delivery Method"; - - /** - * The name for the delivery method attribute syntax. - */ + /** The name for the delivery method attribute syntax. */ public static final String SYNTAX_DELIVERY_METHOD_NAME = "DeliveryMethod"; - - /** - * The OID for the delivery method attribute syntax. - */ + /** The OID for the delivery method attribute syntax. */ public static final String SYNTAX_DELIVERY_METHOD_OID = "1.3.6.1.4.1.1466.115.121.1.14"; - /** - * The description for the Directory String attribute syntax. - */ + /** The description for the Directory String attribute syntax. */ public static final String SYNTAX_DIRECTORY_STRING_DESCRIPTION = "Directory String"; - - /** - * The name for the Directory String attribute syntax. - */ + /** The name for the Directory String attribute syntax. */ public static final String SYNTAX_DIRECTORY_STRING_NAME = "DirectoryString"; - - /** - * The OID for the Directory String attribute syntax. - */ + /** The OID for the Directory String attribute syntax. */ public static final String SYNTAX_DIRECTORY_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.15"; - /** - * The description for the DIT content rule description attribute syntax. - */ + /** The description for the DIT content rule description attribute syntax. */ public static final String SYNTAX_DIT_CONTENT_RULE_DESCRIPTION = "DIT Content Rule Description"; - - /** - * The name for the DIT content rule description attribute syntax. - */ + /** The name for the DIT content rule description attribute syntax. */ public static final String SYNTAX_DIT_CONTENT_RULE_NAME = "DITContentRuleDescription"; - - /** - * The OID for the DIT content rule description attribute syntax. - */ + /** The OID for the DIT content rule description attribute syntax. */ public static final String SYNTAX_DIT_CONTENT_RULE_OID = "1.3.6.1.4.1.1466.115.121.1.16"; - /** - * The description for the DIT structure rule description attribute syntax. - */ + /** The description for the DIT structure rule description attribute syntax. */ public static final String SYNTAX_DIT_STRUCTURE_RULE_DESCRIPTION = "DIT Structure Rule Description"; - - /** - * The name for the DIT structure rule description attribute syntax. - */ + /** The name for the DIT structure rule description attribute syntax. */ public static final String SYNTAX_DIT_STRUCTURE_RULE_NAME = "DITStructureRuleDescription"; - - /** - * The OID for the DIT structure rule description attribute syntax. - */ + /** The OID for the DIT structure rule description attribute syntax. */ public static final String SYNTAX_DIT_STRUCTURE_RULE_OID = "1.3.6.1.4.1.1466.115.121.1.17"; - /** - * The description for the distinguished name attribute syntax. - */ + /** The description for the distinguished name attribute syntax. */ public static final String SYNTAX_DN_DESCRIPTION = "DN"; - - /** - * The name for the distinguished name attribute syntax. - */ + /** The name for the distinguished name attribute syntax. */ public static final String SYNTAX_DN_NAME = "DN"; - - /** - * The OID for the distinguished name attribute syntax. - */ + /** The OID for the distinguished name attribute syntax. */ public static final String SYNTAX_DN_OID = "1.3.6.1.4.1.1466.115.121.1.12"; - /** - * The description for the enhanced guide attribute syntax. - */ + /** The description for the enhanced guide attribute syntax. */ public static final String SYNTAX_ENHANCED_GUIDE_DESCRIPTION = "Enhanced Guide"; - - /** - * The name for the enhanced guide attribute syntax. - */ + /** The name for the enhanced guide attribute syntax. */ public static final String SYNTAX_ENHANCED_GUIDE_NAME = "EnhancedGuide"; - - /** - * The OID for the enhanced guide attribute syntax. - */ + /** The OID for the enhanced guide attribute syntax. */ public static final String SYNTAX_ENHANCED_GUIDE_OID = "1.3.6.1.4.1.1466.115.121.1.21"; - /** - * The description for the facsimile telephone number attribute syntax. - */ + /** The description for the facsimile telephone number attribute syntax. */ public static final String SYNTAX_FAXNUMBER_DESCRIPTION = "Facsimile Telephone Number"; - - /** - * The name for the facsimile telephone number attribute syntax. - */ + /** The name for the facsimile telephone number attribute syntax. */ public static final String SYNTAX_FAXNUMBER_NAME = "FacsimileTelephoneNumber"; - - /** - * The OID for the facsimile telephone number attribute syntax. - */ + /** The OID for the facsimile telephone number attribute syntax. */ public static final String SYNTAX_FAXNUMBER_OID = "1.3.6.1.4.1.1466.115.121.1.22"; - /** - * The description for the fax attribute syntax. - */ + /** The description for the fax attribute syntax. */ public static final String SYNTAX_FAX_DESCRIPTION = "Fax"; - - /** - * The name for the fax attribute syntax. - */ + /** The name for the fax attribute syntax. */ public static final String SYNTAX_FAX_NAME = "Fax"; - - /** - * The OID for the fax attribute syntax. - */ + /** The OID for the fax attribute syntax. */ public static final String SYNTAX_FAX_OID = "1.3.6.1.4.1.1466.115.121.1.23"; - /** - * The description for the generalized time attribute syntax. - */ + /** The description for the generalized time attribute syntax. */ public static final String SYNTAX_GENERALIZED_TIME_DESCRIPTION = "Generalized Time"; - - /** - * The name for the generalized time attribute syntax. - */ + /** The name for the generalized time attribute syntax. */ public static final String SYNTAX_GENERALIZED_TIME_NAME = "GeneralizedTime"; - - /** - * The OID for the generalized time attribute syntax. - */ + /** The OID for the generalized time attribute syntax. */ public static final String SYNTAX_GENERALIZED_TIME_OID = "1.3.6.1.4.1.1466.115.121.1.24"; - /** - * The description for the guide attribute syntax. - */ + /** The description for the guide attribute syntax. */ public static final String SYNTAX_GUIDE_DESCRIPTION = "Guide"; - - /** - * The name for the guide attribute syntax. - */ + /** The name for the guide attribute syntax. */ public static final String SYNTAX_GUIDE_NAME = "Guide"; - - /** - * The OID for the guide attribute syntax. - */ + /** The OID for the guide attribute syntax. */ public static final String SYNTAX_GUIDE_OID = "1.3.6.1.4.1.1466.115.121.1.25"; - /** - * The description for the IA5 string attribute syntax. - */ - public static final String SYNTAX_IA5_STRING_DESCRIPTION = "IA5 String"; - - /** - * The name for the IA5 string attribute syntax. - */ + /** The description for the IA5 string attribute syntax. */ + public static final String SYNTAX_IA5_STRING_DESCRIPTION = "IA5 String"; + /** The name for the IA5 string attribute syntax. */ public static final String SYNTAX_IA5_STRING_NAME = "IA5String"; - - /** - * The OID for the IA5 string attribute syntax. - */ + /** The OID for the IA5 string attribute syntax. */ public static final String SYNTAX_IA5_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.26"; - /** - * The description for the integer attribute syntax. - */ + /** The description for the integer attribute syntax. */ public static final String SYNTAX_INTEGER_DESCRIPTION = "Integer"; - - /** - * The name for the integer attribute syntax. - */ + /** The name for the integer attribute syntax. */ public static final String SYNTAX_INTEGER_NAME = "Integer"; - - /** - * The OID for the integer attribute syntax. - */ + /** The OID for the integer attribute syntax. */ public static final String SYNTAX_INTEGER_OID = "1.3.6.1.4.1.1466.115.121.1.27"; - /** - * The description for the JPEG attribute syntax. - */ + /** The description for the JPEG attribute syntax. */ public static final String SYNTAX_JPEG_DESCRIPTION = "JPEG"; - - /** - * The name for the JPEG attribute syntax. - */ + /** The name for the JPEG attribute syntax. */ public static final String SYNTAX_JPEG_NAME = "JPEG"; - - /** - * The OID for the JPEG attribute syntax. - */ + /** The OID for the JPEG attribute syntax. */ public static final String SYNTAX_JPEG_OID = "1.3.6.1.4.1.1466.115.121.1.28"; - /** - * The description for the LDAP syntax description attribute syntax. - */ + /** The description for the LDAP syntax description attribute syntax. */ public static final String SYNTAX_LDAP_SYNTAX_DESCRIPTION = "LDAP Syntax Description"; - - /** - * The name for the LDAP syntax description attribute syntax. - */ + /** The name for the LDAP syntax description attribute syntax. */ public static final String SYNTAX_LDAP_SYNTAX_NAME = "LDAPSyntaxDescription"; - - /** - * The OID for the LDAP syntax description attribute syntax. - */ + /** The OID for the LDAP syntax description attribute syntax. */ public static final String SYNTAX_LDAP_SYNTAX_OID = "1.3.6.1.4.1.1466.115.121.1.54"; - /** - * The description for the matching rule description attribute syntax. - */ + /** The description for the matching rule description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_DESCRIPTION = "Matching Rule Description"; - - /** - * The name for the matching rule description attribute syntax. - */ + /** The name for the matching rule description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_NAME = "MatchingRuleDescription"; - - /** - * The OID for the matching rule description attribute syntax. - */ + /** The OID for the matching rule description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_OID = "1.3.6.1.4.1.1466.115.121.1.30"; - /** - * The description for the matching rule use description attribute syntax. - */ + /** The description for the matching rule use description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_USE_DESCRIPTION = "Matching Rule Use Description"; - - /** - * The name for the matching rule use description attribute syntax. - */ + /** The name for the matching rule use description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_USE_NAME = "MatchingRuleUseDescription"; - - /** - * The OID for the matching rule use description attribute syntax. - */ + /** The OID for the matching rule use description attribute syntax. */ public static final String SYNTAX_MATCHING_RULE_USE_OID = "1.3.6.1.4.1.1466.115.121.1.31"; - /** - * The description for the name and optional uid attribute syntax. - */ + /** The description for the name and optional uid attribute syntax. */ public static final String SYNTAX_NAME_AND_OPTIONAL_UID_DESCRIPTION = "Name and Optional UID"; - - /** - * The name for the name and optional uid attribute syntax. - */ + /** The name for the name and optional uid attribute syntax. */ public static final String SYNTAX_NAME_AND_OPTIONAL_UID_NAME = "NameAndOptionalUID"; - - /** - * The OID for the name and optional uid attribute syntax. - */ + /** The OID for the name and optional uid attribute syntax. */ public static final String SYNTAX_NAME_AND_OPTIONAL_UID_OID = "1.3.6.1.4.1.1466.115.121.1.34"; - /** - * The description for the name form description attribute syntax. - */ + /** The description for the name form description attribute syntax. */ public static final String SYNTAX_NAME_FORM_DESCRIPTION = "Name Form Description"; - - /** - * The name for the name form description attribute syntax. - */ + /** The name for the name form description attribute syntax. */ public static final String SYNTAX_NAME_FORM_NAME = "NameFormDescription"; - - /** - * The OID for the name form description attribute syntax. - */ + /** The OID for the name form description attribute syntax. */ public static final String SYNTAX_NAME_FORM_OID = "1.3.6.1.4.1.1466.115.121.1.35"; - /** - * The description for the numeric string attribute syntax. - */ + /** The description for the numeric string attribute syntax. */ public static final String SYNTAX_NUMERIC_STRING_DESCRIPTION = "Numeric String"; - - /** - * The name for the numeric string attribute syntax. - */ + /** The name for the numeric string attribute syntax. */ public static final String SYNTAX_NUMERIC_STRING_NAME = "NumericString"; - - /** - * The OID for the numeric string attribute syntax. - */ + /** The OID for the numeric string attribute syntax. */ public static final String SYNTAX_NUMERIC_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.36"; - /** - * The description for the object class description attribute syntax. - */ + /** The description for the object class description attribute syntax. */ public static final String SYNTAX_OBJECTCLASS_DESCRIPTION = "Object Class Description"; - - /** - * The name for the object class description attribute syntax. - */ + /** The name for the object class description attribute syntax. */ public static final String SYNTAX_OBJECTCLASS_NAME = "ObjectClassDescription"; - - /** - * The OID for the object class description attribute syntax. - */ + /** The OID for the object class description attribute syntax. */ public static final String SYNTAX_OBJECTCLASS_OID = "1.3.6.1.4.1.1466.115.121.1.37"; - /** - * The description for the octet string attribute syntax. - */ + /** The description for the octet string attribute syntax. */ public static final String SYNTAX_OCTET_STRING_DESCRIPTION = "Octet String"; - - /** - * The name for the octet string attribute syntax. - */ + /** The name for the octet string attribute syntax. */ public static final String SYNTAX_OCTET_STRING_NAME = "OctetString"; - - /** - * The OID for the octet string attribute syntax. - */ + /** The OID for the octet string attribute syntax. */ public static final String SYNTAX_OCTET_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.40"; - /** - * The description for the object identifier attribute syntax. - */ + /** The description for the object identifier attribute syntax. */ public static final String SYNTAX_OID_DESCRIPTION = "OID"; - - /** - * The name for the object identifier attribute syntax. - */ + /** The name for the object identifier attribute syntax. */ public static final String SYNTAX_OID_NAME = "OID"; - - /** - * The OID for the object identifier attribute syntax. - */ + /** The OID for the object identifier attribute syntax. */ public static final String SYNTAX_OID_OID = "1.3.6.1.4.1.1466.115.121.1.38"; - /** - * The description for the other mailbox attribute syntax. - */ + /** The description for the other mailbox attribute syntax. */ public static final String SYNTAX_OTHER_MAILBOX_DESCRIPTION = "Other Mailbox"; - - /** - * The name for the other mailbox attribute syntax. - */ + /** The name for the other mailbox attribute syntax. */ public static final String SYNTAX_OTHER_MAILBOX_NAME = "OtherMailbox"; - - /** - * The OID for the other mailbox attribute syntax. - */ + /** The OID for the other mailbox attribute syntax. */ public static final String SYNTAX_OTHER_MAILBOX_OID = "1.3.6.1.4.1.1466.115.121.1.39"; - /** - * The description for the postal address attribute syntax. - */ + /** The description for the postal address attribute syntax. */ public static final String SYNTAX_POSTAL_ADDRESS_DESCRIPTION = "Postal Address"; - - /** - * The name for the postal address attribute syntax. - */ + /** The name for the postal address attribute syntax. */ public static final String SYNTAX_POSTAL_ADDRESS_NAME = "PostalAddress"; - - /** - * The OID for the postal address attribute syntax. - */ + /** The OID for the postal address attribute syntax. */ public static final String SYNTAX_POSTAL_ADDRESS_OID = "1.3.6.1.4.1.1466.115.121.1.41"; - /** - * The description for the presentation address attribute syntax. - */ + /** The description for the presentation address attribute syntax. */ public static final String SYNTAX_PRESENTATION_ADDRESS_DESCRIPTION = "Presentation Address"; - - /** - * The name for the presentation address attribute syntax. - */ + /** The name for the presentation address attribute syntax. */ public static final String SYNTAX_PRESENTATION_ADDRESS_NAME = "PresentationAddress"; - - /** - * The OID for the presentation address attribute syntax. - */ + /** The OID for the presentation address attribute syntax. */ public static final String SYNTAX_PRESENTATION_ADDRESS_OID = "1.3.6.1.4.1.1466.115.121.1.43"; - /** - * The description for the printable string attribute syntax. - */ + /** The description for the printable string attribute syntax. */ public static final String SYNTAX_PRINTABLE_STRING_DESCRIPTION = "Printable String"; - - /** - * The name for the printable string attribute syntax. - */ + /** The name for the printable string attribute syntax. */ public static final String SYNTAX_PRINTABLE_STRING_NAME = "PrintableString"; - - /** - * The OID for the printable string attribute syntax. - */ + /** The OID for the printable string attribute syntax. */ public static final String SYNTAX_PRINTABLE_STRING_OID = "1.3.6.1.4.1.1466.115.121.1.44"; - /** - * The description for the protocol information attribute syntax. - */ + /** The description for the protocol information attribute syntax. */ public static final String SYNTAX_PROTOCOL_INFORMATION_DESCRIPTION = "Protocol Information"; - - /** - * The name for the protocol information attribute syntax. - */ + /** The name for the protocol information attribute syntax. */ public static final String SYNTAX_PROTOCOL_INFORMATION_NAME = "ProtocolInformation"; - - /** - * The OID for the protocol information attribute syntax. - */ + /** The OID for the protocol information attribute syntax. */ public static final String SYNTAX_PROTOCOL_INFORMATION_OID = "1.3.6.1.4.1.1466.115.121.1.42"; - /** - * The OID for the relative subtree specification attribute syntax. - */ + /** The OID for the relative subtree specification attribute syntax. */ public static final String SYNTAX_RELATIVE_SUBTREE_SPECIFICATION_OID = OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE + ".2"; - - /** - * The description for the relative subtree specification attribute syntax. - */ + /** The description for the relative subtree specification attribute syntax. */ public static final String SYNTAX_RELATIVE_SUBTREE_SPECIFICATION_DESCRIPTION = "Relative Subtree Specification"; - - /** - * The name for the relative subtree specification attribute syntax. - */ + /** The name for the relative subtree specification attribute syntax. */ public static final String SYNTAX_RELATIVE_SUBTREE_SPECIFICATION_NAME = "ds-relative-subtree-specification"; - /** - * The OID for the RFC3672 subtree specification attribute syntax. - */ + /** The OID for the RFC3672 subtree specification attribute syntax. */ public static final String SYNTAX_RFC3672_SUBTREE_SPECIFICATION_OID = "1.3.6.1.4.1.1466.115.121.1.45"; - - /** - * The description for the RFC3672 subtree specification attribute syntax. - */ + /** The description for the RFC3672 subtree specification attribute syntax. */ public static final String SYNTAX_RFC3672_SUBTREE_SPECIFICATION_DESCRIPTION = "RFC3672 Subtree Specification"; - - /** - * The name for the RFC3672 subtree specification attribute syntax. - */ + /** The name for the RFC3672 subtree specification attribute syntax. */ public static final String SYNTAX_RFC3672_SUBTREE_SPECIFICATION_NAME = "SubtreeSpecification"; - /** - * The description for the substring assertion attribute syntax. - */ + /** The description for the substring assertion attribute syntax. */ public static final String SYNTAX_SUBSTRING_ASSERTION_DESCRIPTION = "Substring Assertion"; - - /** - * The name for the substring assertion attribute syntax. - */ + /** The name for the substring assertion attribute syntax. */ public static final String SYNTAX_SUBSTRING_ASSERTION_NAME = "SubstringAssertion"; - /** * The OID for the Substring Assertion syntax used for assertion values in * extensible match filters. */ public static final String SYNTAX_SUBSTRING_ASSERTION_OID = "1.3.6.1.4.1.1466.115.121.1.58"; - /** - * The description for the supported algorithm attribute syntax. - */ + /** The description for the supported algorithm attribute syntax. */ public static final String SYNTAX_SUPPORTED_ALGORITHM_DESCRIPTION = "Supported Algorithm"; - - /** - * The name for the supported algorithm attribute syntax. - */ + /** The name for the supported algorithm attribute syntax. */ public static final String SYNTAX_SUPPORTED_ALGORITHM_NAME = "SupportedAlgorithm"; - /** * The OID for the Substring Assertion syntax used for assertion values in * extensible match filters. */ public static final String SYNTAX_SUPPORTED_ALGORITHM_OID = "1.3.6.1.4.1.1466.115.121.1.49"; - /** - * The description for the telephone number attribute syntax. - */ + /** The description for the telephone number attribute syntax. */ public static final String SYNTAX_TELEPHONE_DESCRIPTION = "Telephone Number"; - - /** - * The name for the telephone number attribute syntax. - */ + /** The name for the telephone number attribute syntax. */ public static final String SYNTAX_TELEPHONE_NAME = "TelephoneNumber"; - - /** - * The OID for the telephone number attribute syntax. - */ + /** The OID for the telephone number attribute syntax. */ public static final String SYNTAX_TELEPHONE_OID = "1.3.6.1.4.1.1466.115.121.1.50"; - /** - * The description for the teletex terminal identifier attribute syntax. - */ + /** The description for the teletex terminal identifier attribute syntax. */ public static final String SYNTAX_TELETEX_TERM_ID_DESCRIPTION = "Teletex Terminal Identifier"; - - /** - * The name for the teletex terminal identifier attribute syntax. - */ + /** The name for the teletex terminal identifier attribute syntax. */ public static final String SYNTAX_TELETEX_TERM_ID_NAME = "TeletexTerminalIdentifier"; - - /** - * The OID for the teletex terminal identifier attribute syntax. - */ + /** The OID for the teletex terminal identifier attribute syntax. */ public static final String SYNTAX_TELETEX_TERM_ID_OID = "1.3.6.1.4.1.1466.115.121.1.51"; - /** - * The description for the telex number attribute syntax. - */ + /** The description for the telex number attribute syntax. */ public static final String SYNTAX_TELEX_DESCRIPTION = "Telex Number"; - - /** - * The name for the telex number attribute syntax. - */ + /** The name for the telex number attribute syntax. */ public static final String SYNTAX_TELEX_NAME = "TelexNumber"; - - /** - * The OID for the telex number attribute syntax. - */ + /** The OID for the telex number attribute syntax. */ public static final String SYNTAX_TELEX_OID = "1.3.6.1.4.1.1466.115.121.1.52"; - /** - * The description for the user password attribute syntax. - */ + /** The description for the user password attribute syntax. */ public static final String SYNTAX_USER_PASSWORD_DESCRIPTION = "User Password"; - - /** - * The name for the user password attribute syntax. - */ + /** The name for the user password attribute syntax. */ public static final String SYNTAX_USER_PASSWORD_NAME = "ds-syntax-user-password"; + /** The OID for the user password attribute syntax. */ + public static final String SYNTAX_USER_PASSWORD_OID = OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE + ".1"; - /** - * The OID for the user password attribute syntax. - */ - public static final String SYNTAX_USER_PASSWORD_OID = OID_OPENDS_SERVER_ATTRIBUTE_SYNTAX_BASE - + ".1"; - - /** - * The description for the UTC time attribute syntax. - */ + /** The description for the UTC time attribute syntax. */ public static final String SYNTAX_UTC_TIME_DESCRIPTION = "UTC Time"; - - /** - * The name for the UTC time attribute syntax. - */ + /** The name for the UTC time attribute syntax. */ public static final String SYNTAX_UTC_TIME_NAME = "UTCTime"; - - /** - * The OID for the UTC time attribute syntax. - */ + /** The OID for the UTC time attribute syntax. */ public static final String SYNTAX_UTC_TIME_OID = "1.3.6.1.4.1.1466.115.121.1.53"; - /** - * The description for the UUID attribute syntax. - */ + /** The description for the UUID attribute syntax. */ public static final String SYNTAX_UUID_DESCRIPTION = "UUID"; - - /** - * The name for the UUID attribute syntax. - */ + /** The name for the UUID attribute syntax. */ public static final String SYNTAX_UUID_NAME = "UUID"; - - /** - * The OID for the UUID attribute syntax. - */ + /** The OID for the UUID attribute syntax. */ public static final String SYNTAX_UUID_OID = "1.3.6.1.1.16.1"; - /** - * The description for the "top" objectclass. - */ + /** The description for the "top" objectclass. */ public static final String TOP_OBJECTCLASS_DESCRIPTION = "Topmost ObjectClass"; - - /** - * The name of the "top" objectclass. - */ + /** The name of the "top" objectclass. */ public static final String TOP_OBJECTCLASS_NAME = "top"; - - /** - * The OID for the "top" objectclass. - */ + /** The OID for the "top" objectclass. */ public static final String TOP_OBJECTCLASS_OID = "2.5.6.0"; - /** - * The name for the relative time greater-than extensible ordering matching - * rule. - */ + /** The name for the relative time greater-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_GT_NAME = "relativeTimeGTOrderingMatch"; - - /** - * The alternative name for the relative time greater-than extensible - * ordering matching rule. - */ + /** The alternative name for the relative time greater-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_GT_ALT_NAME = "relativeTimeOrderingMatch.gt"; - - /** - * The OID for the relative time greater-than extensible ordering matching - * rule. - */ + /** The OID for the relative time greater-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_GT_OID = "1.3.6.1.4.1.26027.1.4.5"; - /** - * The name for the relative time less-than extensible ordering matching - * rule. - */ + /** The name for the relative time less-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_LT_NAME = "relativeTimeLTOrderingMatch"; - - /** - * The alternative name for the relative time less-than extensible ordering - * matching rule. - */ + /** The alternative name for the relative time less-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_LT_ALT_NAME = "relativeTimeOrderingMatch.lt"; - - /** - * The OID for the relative time less-than extensible ordering matching - * rule. - */ + /** The OID for the relative time less-than extensible ordering matching rule. */ public static final String EXT_OMR_RELATIVE_TIME_LT_OID = "1.3.6.1.4.1.26027.1.4.6"; - /** - * The OID for the partial date and time extensible matching rule. - */ + /** The OID for the partial date and time extensible matching rule. */ public static final String EXT_PARTIAL_DATE_TIME_OID = "1.3.6.1.4.1.26027.1.4.7"; - - /** - * The name for the partial date and time extensible rule. - */ + /** The name for the partial date and time extensible rule. */ public static final String EXT_PARTIAL_DATE_TIME_NAME = "partialDateAndTimeMatchingRule"; /** @@ -1450,40 +728,23 @@ final class SchemaConstants { */ public static final String SCHEMA_PROPERTY_APPROX_RULE = "X-APPROX"; - /** - * The name of the schema property that will be used to specify the origin - * of a schema element. - */ + /** The name of the schema property that will be used to specify the origin of a schema element. */ public static final String SCHEMA_PROPERTY_ORIGIN = "X-ORIGIN"; - /** - * The OID for the extensibleObject objectclass. - */ + /** The OID for the extensibleObject objectclass. */ public static final String EXTENSIBLE_OBJECT_OBJECTCLASS_OID = "1.3.6.1.4.1.1466.101.120.111"; - - /** - * The name for the extensibleObject objectclass. - */ + /** The name for the extensibleObject objectclass. */ public static final String EXTENSIBLE_OBJECT_OBJECTCLASS_NAME = "extensibleObject"; - /** - * The value representing just one space character. - */ + /** The value representing just one space character. */ public static final ByteString SINGLE_SPACE_VALUE = ByteString.valueOfUtf8(" "); - /** - * The normalized true value. - */ + /** The normalized true value. */ public static final ByteString TRUE_VALUE = ByteString.valueOfUtf8("TRUE"); - - /** - * The normalized false value. - */ + /** The normalized false value. */ public static final ByteString FALSE_VALUE = ByteString.valueOfUtf8("FALSE"); - /** - * The name of the time zone for universal coordinated time (UTC). - */ + /** The name of the time zone for universal coordinated time (UTC). */ public static final String TIME_ZONE_UTC = "UTC"; /** @@ -1497,5 +758,4 @@ final class SchemaConstants { private SchemaConstants() { // Nothing to do. } - } From 32da3b2c77d53a916f08790b468c9b78e67d8b1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Fri, 25 Mar 2016 09:40:13 +0100 Subject: [PATCH 101/125] Code cleanup --- .../org/forgerock/opendj/ldap/Filter.java | 77 +++---- .../ldap/AttributeDescriptionTestCase.java | 215 ++++++++++-------- 2 files changed, 147 insertions(+), 145 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java index 6c802c74b..224692163 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2011 Sun Microsystems, Inc. - * Portions copyright 2012-2015 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -299,22 +299,45 @@ public StringBuilder visitAndFilter(final StringBuilder builder, } @Override - public StringBuilder visitApproxMatchFilter(final StringBuilder builder, - final String attributeDescription, final ByteString assertionValue) { - builder.append('('); - builder.append(attributeDescription); - builder.append("~="); - valueToFilterString(builder, assertionValue); + public StringBuilder visitOrFilter(final StringBuilder builder, + final List subFilters) { + builder.append("(|"); + for (final Filter subFilter : subFilters) { + subFilter.accept(this, builder); + } builder.append(')'); return builder; } + @Override + public StringBuilder visitApproxMatchFilter(final StringBuilder builder, + final String attributeDescription, final ByteString assertionValue) { + return visitBinaryOperator(builder, attributeDescription, "~=", assertionValue); + } + @Override public StringBuilder visitEqualityMatchFilter(final StringBuilder builder, final String attributeDescription, final ByteString assertionValue) { + return visitBinaryOperator(builder, attributeDescription, "=", assertionValue); + } + + @Override + public StringBuilder visitGreaterOrEqualFilter(final StringBuilder builder, + final String attributeDescription, final ByteString assertionValue) { + return visitBinaryOperator(builder, attributeDescription, ">=", assertionValue); + } + + @Override + public StringBuilder visitLessOrEqualFilter(final StringBuilder builder, + final String attributeDescription, final ByteString assertionValue) { + return visitBinaryOperator(builder, attributeDescription, "<=", assertionValue); + } + + private StringBuilder visitBinaryOperator(final StringBuilder builder, + final String attributeDescription, final String operator, final ByteString assertionValue) { builder.append('('); builder.append(attributeDescription); - builder.append("="); + builder.append(operator); valueToFilterString(builder, assertionValue); builder.append(')'); return builder; @@ -345,28 +368,6 @@ public StringBuilder visitExtensibleMatchFilter(final StringBuilder builder, return builder; } - @Override - public StringBuilder visitGreaterOrEqualFilter(final StringBuilder builder, - final String attributeDescription, final ByteString assertionValue) { - builder.append('('); - builder.append(attributeDescription); - builder.append(">="); - valueToFilterString(builder, assertionValue); - builder.append(')'); - return builder; - } - - @Override - public StringBuilder visitLessOrEqualFilter(final StringBuilder builder, - final String attributeDescription, final ByteString assertionValue) { - builder.append('('); - builder.append(attributeDescription); - builder.append("<="); - valueToFilterString(builder, assertionValue); - builder.append(')'); - return builder; - } - @Override public StringBuilder visitNotFilter(final StringBuilder builder, final Filter subFilter) { @@ -376,17 +377,6 @@ public StringBuilder visitNotFilter(final StringBuilder builder, return builder; } - @Override - public StringBuilder visitOrFilter(final StringBuilder builder, - final List subFilters) { - builder.append("(|"); - for (final Filter subFilter : subFilters) { - subFilter.accept(this, builder); - } - builder.append(')'); - return builder; - } - @Override public StringBuilder visitPresentFilter(final StringBuilder builder, final String attributeDescription) { @@ -836,11 +826,11 @@ public static Filter substrings(final String attributeDescription, Reject.ifNull(attributeDescription); Reject.ifFalse(initialSubstring != null || finalSubstring != null - || (anySubstrings != null && anySubstrings.size() > 0), + || (anySubstrings != null && !anySubstrings.isEmpty()), "at least one substring (initial, any or final) must be specified"); List anySubstringList; - if (anySubstrings == null || anySubstrings.size() == 0) { + if (anySubstrings == null || anySubstrings.isEmpty()) { anySubstringList = Collections.emptyList(); } else if (anySubstrings.size() == 1) { final Object anySubstring = anySubstrings.iterator().next(); @@ -1660,5 +1650,4 @@ public String toString() { final StringBuilder builder = new StringBuilder(); return pimpl.accept(TO_STRING_VISITOR, builder).toString(); } - } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java index 5efb17020..9b520fce0 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java @@ -12,9 +12,8 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2012 ForgeRock AS. + * Portions copyright 2012-2016 ForgeRock AS. */ - package org.forgerock.opendj.ldap; import static org.testng.Assert.assertEquals; @@ -29,68 +28,123 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -/** - * Test {@code AttributeDescription}. - */ +/** Test {@link AttributeDescription}. */ @SuppressWarnings("javadoc") public final class AttributeDescriptionTestCase extends SdkTestCase { - @DataProvider(name = "dataForCompareCoreSchema") + + @DataProvider public Object[][] dataForCompareCoreSchema() { - // AD1, AD2, compare result, isSubtype, isSuperType - return new Object[][] { { "cn", "cn", 0, true, true }, - { "cn", "commonName", 0, true, true }, { " cn", "commonName ", 0, true, true }, - { "commonName", "cn", 0, true, true }, { "commonName", "commonName", 0, true, true }, - { "cn", "objectClass", 1, false, false }, { "objectClass", "cn", -1, false, false }, - { "name", "cn", 1, false, true }, { "cn", "name", -1, true, false }, - { "name;foo", "cn", 1, false, false }, { "cn;foo", "name", -1, true, false }, - { "name", "cn;foo", 1, false, true }, { "cn", "name;foo", -1, false, false }, }; + // @formatter:off + return new Object[][] { + // AD1, AD2, compare result, isSubtype, isSuperType + { "cn", "cn", 0, true, true }, + { "cn", "commonName", 0, true, true }, + { " cn", "commonName ", 0, true, true }, + { "commonName", "cn", 0, true, true }, + { "commonName", "commonName", 0, true, true }, + { "cn", "objectClass", 1, false, false }, + { "objectClass", "cn", -1, false, false }, + { "name", "cn", 1, false, true }, + { "cn", "name", -1, true, false }, + { "name;foo", "cn", 1, false, false }, + { "cn;foo", "name", -1, true, false }, + { "name", "cn;foo", 1, false, true }, + { "cn", "name;foo", -1, false, false }, + }; + // @formatter:on } - @DataProvider(name = "dataForCompareNoSchema") + @DataProvider public Object[][] dataForCompareNoSchema() { - // AD1, AD2, compare result, isSubtype, isSuperType - return new Object[][] { { "cn", "cn", 0, true, true }, { "cn", "CN", 0, true, true }, - { "CN", "cn", 0, true, true }, { "CN", "CN", 0, true, true }, - { "cn", "commonName", -1, false, false }, { "commonName", "cn", 1, false, false }, - { "commonName", "commonName", 0, true, true }, { "cn", "cn;foo", -1, false, true }, - { "cn;foo", "cn", 1, true, false }, { "cn;foo", "cn;foo", 0, true, true }, - { "CN;FOO", "cn;foo", 0, true, true }, { "cn;foo", "CN;FOO", 0, true, true }, - { "CN;FOO", "CN;FOO", 0, true, true }, { "cn;foo", "cn;bar", 1, false, false }, + // @formatter:off + return new Object[][] { + // AD1, AD2, compare result, isSubtype, isSuperType + { "cn", "cn", 0, true, true }, + { "cn", "CN", 0, true, true }, + { "CN", "cn", 0, true, true }, + { "CN", "CN", 0, true, true }, + { "cn", "commonName", -1, false, false }, + { "commonName", "cn", 1, false, false }, + { "commonName", "commonName", 0, true, true }, + { "cn", "cn;foo", -1, false, true }, + { "cn;foo", "cn", 1, true, false }, + { "cn;foo", "cn;foo", 0, true, true }, + { "CN;FOO", "cn;foo", 0, true, true }, + { "cn;foo", "CN;FOO", 0, true, true }, + { "CN;FOO", "CN;FOO", 0, true, true }, + { "cn;foo", "cn;bar", 1, false, false }, { "cn;bar", "cn;foo", -1, false, false }, - { "cn;xxx;yyy", "cn", 1, true, false }, { "cn;xxx;yyy", "cn;yyy", 1, true, false }, + { "cn;xxx;yyy", "cn", 1, true, false }, + { "cn;xxx;yyy", "cn;yyy", 1, true, false }, { "cn;xxx;yyy", "cn;xxx", 1, true, false }, { "cn;xxx;yyy", "cn;xxx;yyy", 0, true, true }, { "cn;xxx;yyy", "cn;yyy;xxx", 0, true, true }, - { "cn", "cn;xxx;yyy", -1, false, true }, { "cn;yyy", "cn;xxx;yyy", -1, false, true }, + { "cn", "cn;xxx;yyy", -1, false, true }, + { "cn;yyy", "cn;xxx;yyy", -1, false, true }, { "cn;xxx", "cn;xxx;yyy", -1, false, true }, { "cn;xxx;yyy", "cn;xxx;yyy", 0, true, true }, - { "cn;yyy;xxx", "cn;xxx;yyy", 0, true, true }, }; + { "cn;yyy;xxx", "cn;xxx;yyy", 0, true, true }, + }; + // @formatter:on } - @DataProvider(name = "dataForValueOfCoreSchema") + @DataProvider public Object[][] dataForValueOfCoreSchema() { - // Value, type, isObjectClass - return new Object[][] { { "cn", "cn", false }, { "CN", "cn", false }, - { "commonName", "cn", false }, { "objectclass", "objectClass", true }, }; + // @formatter:off + return new Object[][] { + // Value, type, isObjectClass + { "cn", "cn", false }, + { "CN", "cn", false }, + { "commonName", "cn", false }, + { "objectclass", "objectClass", true }, + }; + // @formatter:on } - @DataProvider(name = "dataForValueOfInvalidAttributeDescriptions") + @DataProvider public Object[][] dataForValueOfInvalidAttributeDescriptions() { - return new Object[][] { { "" }, { " " }, { ";" }, { " ; " }, { "0cn" }, { "cn+" }, - { "cn;foo+bar" }, { "cn;foo;foo+bar" }, { ";foo" }, { "cn;" }, { "cn;;foo" }, - { "cn; ;foo" }, { "cn;foo;" }, { "cn;foo; " }, { "cn;foo;;bar" }, { "cn;foo; ;bar" }, - { "cn;foo;bar;;" }, { "1a" }, { "1.a" }, { "1-" }, { "1.1a" }, { "1.1.a" }, }; + // @formatter:off + return new Object[][] { + { "" }, + { " " }, + { ";" }, + { " ; " }, + { "0cn" }, + { "cn+" }, + { "cn;foo+bar" }, + { "cn;foo;foo+bar" }, + { ";foo" }, + { "cn;" }, + { "cn;;foo" }, + { "cn; ;foo" }, + { "cn;foo;" }, + { "cn;foo; " }, + { "cn;foo;;bar" }, + { "cn;foo; ;bar" }, + { "cn;foo;bar;;" }, + { "1a" }, + { "1.a" }, + { "1-" }, + { "1.1a" }, + { "1.1.a" }, + }; + // @formatter:on } - @DataProvider(name = "dataForValueOfNoSchema") + @DataProvider public Object[][] dataForValueOfNoSchema() { - // Value, type, options, containsOptions("foo") - return new Object[][] { { "cn", "cn", new String[0], false }, - { " cn ", "cn", new String[0], false }, { " cn ", "cn", new String[0], false }, - { "CN", "CN", new String[0], false }, { "1", "1", new String[0], false }, - { "1.2", "1.2", new String[0], false }, { "1.2.3", "1.2.3", new String[0], false }, + // @formatter:off + return new Object[][] { + // Value, type, options, containsOptions("foo") + { "cn", "cn", new String[0], false }, + { " cn ", "cn", new String[0], false }, + { " cn ", "cn", new String[0], false }, + { "CN", "CN", new String[0], false }, + { "1", "1", new String[0], false }, + { "1.2", "1.2", new String[0], false }, + { "1.2.3", "1.2.3", new String[0], false }, { "111.222.333", "111.222.333", new String[0], false }, { "objectClass", "objectClass", new String[0], false }, { "cn;foo", "cn", new String[] { "foo" }, true }, @@ -108,72 +162,40 @@ public Object[][] dataForValueOfNoSchema() { { " cn;BAR;FOO ", "cn", new String[] { "BAR", "FOO" }, true }, { " cn;BAR;FOO ", "cn", new String[] { "BAR", "FOO" }, true }, { "cn;xxx;yyy;zzz", "cn", new String[] { "xxx", "yyy", "zzz" }, false }, - { "cn;zzz;YYY;xxx", "cn", new String[] { "zzz", "YYY", "xxx" }, false }, }; + }; + // @formatter:on } @Test(dataProvider = "dataForCompareCoreSchema") public void testCompareCoreSchema(final String ad1, final String ad2, final int compare, final boolean isSubType, final boolean isSuperType) { - final AttributeDescription attributeDescription1 = - AttributeDescription.valueOf(ad1, Schema.getCoreSchema()); - - final AttributeDescription attributeDescription2 = - AttributeDescription.valueOf(ad2, Schema.getCoreSchema()); - - // Identity. - assertTrue(attributeDescription1.equals(attributeDescription1)); - assertTrue(attributeDescription1.compareTo(attributeDescription1) == 0); - assertTrue(attributeDescription1.isSubTypeOf(attributeDescription1)); - assertTrue(attributeDescription1.isSuperTypeOf(attributeDescription1)); - - if (compare == 0) { - assertTrue(attributeDescription1.equals(attributeDescription2)); - assertTrue(attributeDescription2.equals(attributeDescription1)); - assertTrue(attributeDescription1.compareTo(attributeDescription2) == 0); - assertTrue(attributeDescription2.compareTo(attributeDescription1) == 0); - - assertTrue(attributeDescription1.isSubTypeOf(attributeDescription2)); - assertTrue(attributeDescription1.isSuperTypeOf(attributeDescription2)); - assertTrue(attributeDescription2.isSubTypeOf(attributeDescription1)); - assertTrue(attributeDescription2.isSuperTypeOf(attributeDescription1)); - } else { - assertFalse(attributeDescription1.equals(attributeDescription2)); - assertFalse(attributeDescription2.equals(attributeDescription1)); - - if (compare < 0) { - assertTrue(attributeDescription1.compareTo(attributeDescription2) < 0); - assertTrue(attributeDescription2.compareTo(attributeDescription1) > 0); - } else { - assertTrue(attributeDescription1.compareTo(attributeDescription2) > 0); - assertTrue(attributeDescription2.compareTo(attributeDescription1) < 0); - } - - assertEquals(attributeDescription1.isSubTypeOf(attributeDescription2), isSubType); - - assertEquals(attributeDescription1.isSuperTypeOf(attributeDescription2), isSuperType); - } + Schema schema = Schema.getCoreSchema(); + compare0(ad1, ad2, compare, isSubType, isSuperType, schema); } @Test(dataProvider = "dataForCompareNoSchema") public void testCompareNoSchema(final String ad1, final String ad2, final int compare, final boolean isSubType, final boolean isSuperType) { - final AttributeDescription attributeDescription1 = - AttributeDescription.valueOf(ad1, Schema.getEmptySchema()); + Schema schema = Schema.getEmptySchema(); + compare0(ad1, ad2, compare, isSubType, isSuperType, schema); + } - final AttributeDescription attributeDescription2 = - AttributeDescription.valueOf(ad2, Schema.getEmptySchema()); + private void compare0(final String ad1, final String ad2, final int compare, + final boolean isSubType, final boolean isSuperType, final Schema schema) { + final AttributeDescription attributeDescription1 = AttributeDescription.valueOf(ad1, schema); + final AttributeDescription attributeDescription2 = AttributeDescription.valueOf(ad2, schema); // Identity. - assertTrue(attributeDescription1.equals(attributeDescription1)); - assertTrue(attributeDescription1.compareTo(attributeDescription1) == 0); + assertEquals(attributeDescription1, attributeDescription1); + assertEquals(attributeDescription1.compareTo(attributeDescription1), 0); assertTrue(attributeDescription1.isSubTypeOf(attributeDescription1)); assertTrue(attributeDescription1.isSuperTypeOf(attributeDescription1)); if (compare == 0) { - assertTrue(attributeDescription1.equals(attributeDescription2)); - assertTrue(attributeDescription2.equals(attributeDescription1)); - assertTrue(attributeDescription1.compareTo(attributeDescription2) == 0); - assertTrue(attributeDescription2.compareTo(attributeDescription1) == 0); + assertEquals(attributeDescription1, attributeDescription2); + assertEquals(attributeDescription2, attributeDescription1); + assertEquals(attributeDescription1.compareTo(attributeDescription2), 0); + assertEquals(attributeDescription2.compareTo(attributeDescription1), 0); assertTrue(attributeDescription1.isSubTypeOf(attributeDescription2)); assertTrue(attributeDescription1.isSuperTypeOf(attributeDescription2)); @@ -192,7 +214,6 @@ public void testCompareNoSchema(final String ad1, final String ad2, final int co } assertEquals(attributeDescription1.isSubTypeOf(attributeDescription2), isSubType); - assertEquals(attributeDescription1.isSuperTypeOf(attributeDescription2), isSuperType); } } @@ -205,7 +226,6 @@ public void testValueOfCoreSchema(final String ad, final String at, final boolea assertEquals(attributeDescription.toString(), ad); assertEquals(attributeDescription.getAttributeType().getNameOrOID(), at); - assertEquals(attributeDescription.isObjectClass(), isObjectClass); assertFalse(attributeDescription.hasOptions()); @@ -215,7 +235,7 @@ public void testValueOfCoreSchema(final String ad, final String at, final boolea assertFalse(iterator.hasNext()); } - /** FIXME: none of these pass! The valueOf method is far to lenient. */ + /** FIXME: none of these pass! The valueOf method is far too lenient. */ @Test(dataProvider = "dataForValueOfInvalidAttributeDescriptions", expectedExceptions = LocalizedIllegalArgumentException.class) public void testValueOfInvalidAttributeDescriptions(final String ad) { @@ -229,16 +249,10 @@ public void testValueOfNoSchema(final String ad, final String at, final String[] AttributeDescription.valueOf(ad, Schema.getEmptySchema()); assertEquals(attributeDescription.toString(), ad); - assertEquals(attributeDescription.getAttributeType().getNameOrOID(), at); - assertFalse(attributeDescription.isObjectClass()); - if (options.length == 0) { - assertFalse(attributeDescription.hasOptions()); - } else { - assertTrue(attributeDescription.hasOptions()); - } + assertEquals(attributeDescription.hasOptions(), options.length != 0); assertFalse(attributeDescription.hasOption("dummy")); if (containsFoo) { @@ -405,5 +419,4 @@ public void testWithoutOptionThirdOptionMissing() { AttributeDescription ad2 = ad1.withoutOption("dummy"); assertSame(ad1, ad2); } - } From 6336790ebd72eb17b7d27d4e3d858341ace428d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Fri, 25 Mar 2016 14:53:49 +0100 Subject: [PATCH 102/125] OPENDJ-2803 Migrate Attribute Added AttributeDescription.getNameOrOID() + create() methods to return the user supplied attribute name --- .../opendj/ldap/AttributeDescription.java | 224 ++++++++++++------ .../ldap/AttributeDescriptionTestCase.java | 222 +++++++++++++---- 2 files changed, 323 insertions(+), 123 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java index 7f732b6f1..754c6546a 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java @@ -81,7 +81,6 @@ protected Impl() { private static final class MultiOptionImpl extends Impl { private final String[] normalizedOptions; - private final String[] options; private MultiOptionImpl(final String[] options, final String[] normalizedOptions) { @@ -203,7 +202,6 @@ public int size() { private static final class SingleOptionImpl extends Impl { private final String normalizedOption; - private final String option; private SingleOptionImpl(final String option, final String normalizedOption) { @@ -351,9 +349,8 @@ protected WeakHashMap> initialValue() private static final AttributeDescription OBJECT_CLASS; static { final AttributeType attributeType = Schema.getCoreSchema().getAttributeType("2.5.4.0"); - OBJECT_CLASS = - new AttributeDescription(attributeType.getNameOrOID(), attributeType, - ZERO_OPTION_IMPL); + final String attributeName = attributeType.getNameOrOID(); + OBJECT_CLASS = new AttributeDescription(attributeName, attributeName, attributeType, ZERO_OPTION_IMPL); } /** @@ -378,21 +375,15 @@ public AttributeDescription withOption(final String option) { Reject.ifNull(option); final String normalizedOption = toLowerCase(option); - if (pimpl.hasOption(normalizedOption)) { + if (optionsPimpl.hasOption(normalizedOption)) { return this; } - final String oldAttributeDescription = attributeDescription; - final StringBuilder builder = - new StringBuilder(oldAttributeDescription.length() + option.length() + 1); - builder.append(oldAttributeDescription); - builder.append(';'); - builder.append(option); - final String newAttributeDescription = builder.toString(); + final String newAttributeDescription = appendOption(attributeDescription, option); - final Impl impl = pimpl; + final Impl impl = optionsPimpl; if (impl instanceof ZeroOptionImpl) { - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, new SingleOptionImpl(option, normalizedOption)); } else if (impl instanceof SingleOptionImpl) { final SingleOptionImpl simpl = (SingleOptionImpl) impl; @@ -410,7 +401,7 @@ public AttributeDescription withOption(final String option) { newNormalizedOptions[1] = normalizedOption; } - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, new MultiOptionImpl(newOptions, newNormalizedOptions)); } else { final MultiOptionImpl mimpl = (MultiOptionImpl) impl; @@ -441,7 +432,7 @@ public AttributeDescription withOption(final String option) { newNormalizedOptions[sz2] = normalizedOption; } - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, new MultiOptionImpl(newOptions, newNormalizedOptions)); } } @@ -464,7 +455,7 @@ public AttributeDescription withoutOption(final String option) { Reject.ifNull(option); final String normalizedOption = toLowerCase(option); - if (!pimpl.hasOption(normalizedOption)) { + if (!optionsPimpl.hasOption(normalizedOption)) { return this; } @@ -479,11 +470,11 @@ public AttributeDescription withoutOption(final String option) { .length()); final String newAttributeDescription = builder.toString(); - final Impl impl = pimpl; + final Impl impl = optionsPimpl; if (impl instanceof ZeroOptionImpl) { throw new IllegalStateException("ZeroOptionImpl unexpected"); } else if (impl instanceof SingleOptionImpl) { - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, ZERO_OPTION_IMPL); } else { final MultiOptionImpl mimpl = (MultiOptionImpl) impl; @@ -503,7 +494,7 @@ public AttributeDescription withoutOption(final String option) { remainingNormalizedOption = mimpl.normalizedOptions[0]; } - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, new SingleOptionImpl(remainingOption, remainingNormalizedOption)); } else { final String[] newOptions = new String[mimpl.options.length - 1]; @@ -522,15 +513,14 @@ public AttributeDescription withoutOption(final String option) { } } - return new AttributeDescription(newAttributeDescription, attributeType, + return new AttributeDescription(newAttributeDescription, nameOrOid, attributeType, new MultiOptionImpl(newOptions, newNormalizedOptions)); } } } /** - * Creates an attribute description having the provided attribute type and - * no options. + * Creates an attribute description having the provided attribute type and no options. * * @param attributeType * The attribute type. @@ -539,21 +529,35 @@ public AttributeDescription withoutOption(final String option) { * If {@code attributeType} was {@code null}. */ public static AttributeDescription create(final AttributeType attributeType) { - Reject.ifNull(attributeType); + return create(attributeType.getNameOrOID(), attributeType); + } + + /** + * Creates an attribute description having the provided attribute name, type and no options. + * + * @param attributeName + * The attribute name. + * @param attributeType + * The attribute type. + * @return The attribute description. + * @throws NullPointerException + * If {@code attributeType} was {@code null}. + * @deprecated This method may be removed at any time + * @since OPENDJ-2803 Migrate Attribute + */ + @Deprecated + public static AttributeDescription create(final String attributeName, final AttributeType attributeType) { + Reject.ifNull(attributeName, attributeType); - // Use object identity in case attribute type does not come from - // core schema. + // Use object identity in case attribute type does not come from core schema. if (attributeType == OBJECT_CLASS.getAttributeType()) { return OBJECT_CLASS; - } else { - return new AttributeDescription(attributeType.getNameOrOID(), attributeType, - ZERO_OPTION_IMPL); } + return new AttributeDescription(attributeName, attributeName, attributeType, ZERO_OPTION_IMPL); } /** - * Creates an attribute description having the provided attribute type and - * single option. + * Creates an attribute description having the provided attribute type and single option. * * @param attributeType * The attribute type. @@ -564,18 +568,64 @@ public static AttributeDescription create(final AttributeType attributeType) { * If {@code attributeType} or {@code option} was {@code null}. */ public static AttributeDescription create(final AttributeType attributeType, final String option) { - Reject.ifNull(attributeType, option); + return create(attributeType.getNameOrOID(), attributeType, option); + } + + /** + * Creates an attribute description having the provided attribute name, type and single option. + * + * @param attributeName + * The attribute name. + * @param attributeType + * The attribute type. + * @param option + * The attribute option. + * @return The attribute description. + * @throws NullPointerException + * If {@code attributeType} or {@code option} was {@code null}. + * @deprecated This method may be removed at any time + * @since OPENDJ-2803 Migrate Attribute + */ + @Deprecated + public static AttributeDescription create( + final String attributeName, final AttributeType attributeType, final String option) { + Reject.ifNull(attributeName, attributeType, option); + + final String attributeDescription = appendOption(attributeName, option); + final String normalizedOption = toLowerCase(option); + + return new AttributeDescription(attributeDescription, attributeName, attributeType, + new SingleOptionImpl(option, normalizedOption)); + } - final String oid = attributeType.getNameOrOID(); + private static String appendOption(final String oid, final String option) { final StringBuilder builder = new StringBuilder(oid.length() + option.length() + 1); builder.append(oid); builder.append(';'); builder.append(option); - final String attributeDescription = builder.toString(); - final String normalizedOption = toLowerCase(option); + return builder.toString(); + } - return new AttributeDescription(attributeDescription, attributeType, new SingleOptionImpl( - option, normalizedOption)); + /** + * Creates an attribute description having the provided attribute name, type and options. + * + * @param attributeName + * The attribute name. + * @param attributeType + * The attribute type. + * @param options + * The attribute options. + * @return The attribute description. + * @throws NullPointerException + * If {@code attributeType} or {@code options} was {@code null}. + * @deprecated This method may be removed at any time + * @since OPENDJ-2803 Migrate Attribute + */ + @Deprecated + public static AttributeDescription create( + final String attributeName, final AttributeType attributeType, final String... options) { + Reject.ifNull(options); + return create(attributeName, attributeType, Arrays.asList(options)); } /** @@ -591,7 +641,7 @@ public static AttributeDescription create(final AttributeType attributeType, fin */ public static AttributeDescription create(final AttributeType attributeType, final String... options) { Reject.ifNull(options); - return create(attributeType, Arrays.asList(options)); + return create(attributeType.getNameOrOID(), attributeType, Arrays.asList(options)); } /** @@ -606,23 +656,43 @@ public static AttributeDescription create(final AttributeType attributeType, fin * If {@code attributeType} or {@code options} was {@code null}. */ public static AttributeDescription create(final AttributeType attributeType, final Collection options) { - Reject.ifNull(attributeType); + return create(attributeType.getNameOrOID(), attributeType, options); + } + + /** + * Creates an attribute description having the provided attribute name, type and options. + * + * @param attributeName + * The attribute name. + * @param attributeType + * The attribute type. + * @param options + * The attribute options. + * @return The attribute description. + * @throws NullPointerException + * If {@code attributeType} or {@code options} was {@code null}. + * @deprecated This method may be removed at any time + * @since OPENDJ-2803 Migrate Attribute + */ + @Deprecated + public static AttributeDescription create( + final String attributeName, final AttributeType attributeType, final Collection options) { + Reject.ifNull(attributeName, attributeType); final Collection opts = options != null ? options : Collections. emptySet(); switch (opts.size()) { case 0: - return create(attributeType); + return create(attributeName, attributeType); case 1: - return create(attributeType, opts.iterator().next()); + return create(attributeName, attributeType, opts.iterator().next()); default: final String[] optionsList = new String[opts.size()]; final String[] normalizedOptions = new String[opts.size()]; final Iterator it = opts.iterator(); - final String oid = attributeType.getNameOrOID(); final StringBuilder builder = - new StringBuilder(oid.length() + it.next().length() + it.next().length() + 2); - builder.append(oid); + new StringBuilder(attributeName.length() + it.next().length() + it.next().length() + 2); + builder.append(attributeName); int i = 0; for (final String option : opts) { @@ -634,10 +704,9 @@ public static AttributeDescription create(final AttributeType attributeType, fin Arrays.sort(normalizedOptions); final String attributeDescription = builder.toString(); - return new AttributeDescription(attributeDescription, attributeType, + return new AttributeDescription(attributeDescription, attributeName, attributeType, new MultiOptionImpl(optionsList, normalizedOptions)); } - } /** @@ -779,7 +848,6 @@ private static AttributeDescription valueOf0(final String attributeDescription, i++; while (i < length) { c = attributeDescription.charAt(i); - if (c == ';' || c == ' ') { break; } @@ -827,8 +895,7 @@ private static AttributeDescription valueOf0(final String attributeDescription, i = skipTrailingWhiteSpace(attributeDescription, i + 1, length); } - // Determine the portion of the string containing the attribute type - // name. + // Determine the portion of the string containing the attribute type name. String oid; if (attributeTypeStart == 0 && attributeTypeEnd == length) { oid = attributeDescription; @@ -848,15 +915,12 @@ private static AttributeDescription valueOf0(final String attributeDescription, // If we're already at the end of the attribute description then it // does not contain any options. if (i == length) { - // Use object identity in case attribute type does not come from - // core schema. + // Use object identity in case attribute type does not come from core schema. if (attributeType == OBJECT_CLASS.getAttributeType() && attributeDescription.equals(OBJECT_CLASS.toString())) { return OBJECT_CLASS; - } else { - return new AttributeDescription(attributeDescription, attributeType, - ZERO_OPTION_IMPL); } + return new AttributeDescription(attributeDescription, oid, attributeType, ZERO_OPTION_IMPL); } // At this point 'i' must point at a semi-colon. @@ -911,7 +975,7 @@ private static AttributeDescription valueOf0(final String attributeDescription, // If we're already at the end of the attribute description then it // only contains a single option. if (i == length) { - return new AttributeDescription(attributeDescription, attributeType, + return new AttributeDescription(attributeDescription, oid, attributeType, new SingleOptionImpl(option, normalizedOption)); } @@ -977,23 +1041,23 @@ private static AttributeDescription valueOf0(final String attributeDescription, normalizedOptions.add(normalizedOption); } - return new AttributeDescription(attributeDescription, attributeType, new MultiOptionImpl( - options.toArray(new String[options.size()]), normalizedOptions - .toArray(new String[normalizedOptions.size()]))); + return new AttributeDescription(attributeDescription, oid, attributeType, + new MultiOptionImpl(options.toArray(new String[options.size()]), + normalizedOptions.toArray(new String[normalizedOptions.size()]))); } private final String attributeDescription; - + private final String nameOrOid; private final AttributeType attributeType; - - private final Impl pimpl; + private final Impl optionsPimpl; /** Private constructor. */ - private AttributeDescription(final String attributeDescription, + private AttributeDescription(final String attributeDescription, final String attributeName, final AttributeType attributeType, final Impl pimpl) { this.attributeDescription = attributeDescription; + this.nameOrOid = attributeName; this.attributeType = attributeType; - this.pimpl = pimpl; + this.optionsPimpl = pimpl; } /** @@ -1016,7 +1080,7 @@ public int compareTo(final AttributeDescription other) { return result; } else { // Attribute type is the same, so compare options. - return pimpl.compareTo(other.pimpl); + return optionsPimpl.compareTo(other.optionsPimpl); } } @@ -1033,7 +1097,7 @@ public int compareTo(final AttributeDescription other) { */ public boolean hasOption(final String option) { final String normalizedOption = toLowerCase(option); - return pimpl.hasOption(normalizedOption); + return optionsPimpl.hasOption(normalizedOption); } /** @@ -1054,7 +1118,7 @@ public boolean equals(final Object o) { return true; } else if (o instanceof AttributeDescription) { final AttributeDescription other = (AttributeDescription) o; - return attributeType.equals(other.attributeType) && pimpl.equals(other.pimpl); + return attributeType.equals(other.attributeType) && optionsPimpl.equals(other.optionsPimpl); } else { return false; } @@ -1069,6 +1133,20 @@ public AttributeType getAttributeType() { return attributeType; } + /** + * Returns the attribute name or the oid provided by the user associated with this attribute + * description. + * + * @return The attribute name or the oid provided by the user associated with this attribute + * description. + * @deprecated This method may be removed at any time + * @since OPENDJ-2803 Migrate Attribute + */ + @Deprecated + public String getNameOrOID() { + return nameOrOid; + } + /** * Returns an {@code Iterable} containing the options contained in this * attribute description. Attempts to remove options using an iterator's @@ -1078,7 +1156,7 @@ public AttributeType getAttributeType() { * @return An {@code Iterable} containing the options. */ public Iterable getOptions() { - return pimpl; + return optionsPimpl; } /** @@ -1091,7 +1169,7 @@ public Iterable getOptions() { @Override public int hashCode() { // FIXME: should we cache this? - return attributeType.hashCode() * 31 + pimpl.hashCode(); + return attributeType.hashCode() * 31 + optionsPimpl.hashCode(); } /** @@ -1101,7 +1179,7 @@ public int hashCode() { * {@code false} if not. */ public boolean hasOptions() { - return pimpl.hasOptions(); + return optionsPimpl.hasOptions(); } /** @@ -1160,7 +1238,7 @@ public boolean isPlaceHolder() { */ public boolean isSubTypeOf(final AttributeDescription other) { return attributeType.isSubTypeOf(other.attributeType) - && pimpl.isSubTypeOf(other.pimpl); + && optionsPimpl.isSubTypeOf(other.optionsPimpl); } /** @@ -1187,7 +1265,7 @@ public boolean isSubTypeOf(final AttributeDescription other) { */ public boolean isSuperTypeOf(final AttributeDescription other) { return attributeType.isSuperTypeOf(other.attributeType) - && pimpl.isSuperTypeOf(other.pimpl); + && optionsPimpl.isSuperTypeOf(other.optionsPimpl); } /** @@ -1205,7 +1283,7 @@ public boolean matches(final AttributeDescription other) { if (this == other) { return true; } else { - return attributeType.matches(other.attributeType) && pimpl.equals(other.pimpl); + return attributeType.matches(other.attributeType) && optionsPimpl.equals(other.optionsPimpl); } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java index 9b520fce0..a2c061c46 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java @@ -21,9 +21,11 @@ import static org.testng.Assert.assertSame; import static org.testng.Assert.assertTrue; -import java.util.Iterator; +import java.util.Arrays; +import org.assertj.core.api.Assertions; import org.forgerock.i18n.LocalizedIllegalArgumentException; +import org.forgerock.opendj.ldap.schema.AttributeType; import org.forgerock.opendj.ldap.schema.Schema; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -161,7 +163,10 @@ public Object[][] dataForValueOfNoSchema() { { "cn;BAR;FOO", "cn", new String[] { "BAR", "FOO" }, true }, { " cn;BAR;FOO ", "cn", new String[] { "BAR", "FOO" }, true }, { " cn;BAR;FOO ", "cn", new String[] { "BAR", "FOO" }, true }, + { " CN;BAR;FOO ", "CN", new String[] { "BAR", "FOO" }, true }, { "cn;xxx;yyy;zzz", "cn", new String[] { "xxx", "yyy", "zzz" }, false }, + { "cn;zzz;YYY;xxx", "cn", new String[] { "zzz", "YYY", "xxx" }, false }, + { "CN;zzz;YYY;xxx", "CN", new String[] { "zzz", "YYY", "xxx" }, false }, }; // @formatter:on } @@ -224,15 +229,14 @@ public void testValueOfCoreSchema(final String ad, final String at, final boolea AttributeDescription.valueOf(ad, Schema.getCoreSchema()); assertEquals(attributeDescription.toString(), ad); - + assertEquals(attributeDescription.getNameOrOID(), ad); assertEquals(attributeDescription.getAttributeType().getNameOrOID(), at); assertEquals(attributeDescription.isObjectClass(), isObjectClass); assertFalse(attributeDescription.hasOptions()); assertFalse(attributeDescription.hasOption("dummy")); - final Iterator iterator = attributeDescription.getOptions().iterator(); - assertFalse(iterator.hasNext()); + Assertions.assertThat(attributeDescription.getOptions()).isEmpty(); } /** FIXME: none of these pass! The valueOf method is far too lenient. */ @@ -252,8 +256,7 @@ public void testValueOfNoSchema(final String ad, final String at, final String[] assertEquals(attributeDescription.getAttributeType().getNameOrOID(), at); assertFalse(attributeDescription.isObjectClass()); - assertEquals(attributeDescription.hasOptions(), options.length != 0); - + assertOptions(attributeDescription, options); assertFalse(attributeDescription.hasOption("dummy")); if (containsFoo) { assertTrue(attributeDescription.hasOption("foo")); @@ -264,28 +267,24 @@ public void testValueOfNoSchema(final String ad, final String at, final String[] assertFalse(attributeDescription.hasOption("FOO")); assertFalse(attributeDescription.hasOption("FoO")); } + } + private void assertOptions(final AttributeDescription attributeDescription, final String... options) { + assertEquals(attributeDescription.hasOptions(), options.length != 0); for (final String option : options) { assertTrue(attributeDescription.hasOption(option)); } - final Iterator iterator = attributeDescription.getOptions().iterator(); - for (final String option : options) { - assertTrue(iterator.hasNext()); - assertEquals(iterator.next(), option); - } - assertFalse(iterator.hasNext()); + Assertions.assertThat(attributeDescription.getOptions()).containsExactly(options); } @Test public void testWithOptionAddFirstOption() { AttributeDescription ad1 = AttributeDescription.valueOf("cn"); AttributeDescription ad2 = ad1.withOption("test"); - assertTrue(ad2.hasOptions()); - assertTrue(ad2.hasOption("test")); + assertOptions(ad2, "test"); assertFalse(ad2.hasOption("dummy")); assertEquals(ad2.toString(), "cn;test"); - assertEquals(ad2.getOptions().iterator().next(), "test"); } @Test @@ -297,16 +296,20 @@ public void testWithOptionAddExistingFirstOption() { @Test public void testWithOptionAddSecondOption() { - AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1"); - AttributeDescription ad2 = ad1.withOption("test2"); - assertTrue(ad2.hasOptions()); - assertTrue(ad2.hasOption("test1")); - assertTrue(ad2.hasOption("test2")); + testWithOptionAddSecondOption("test1", "test2"); + } + + @Test + public void testWithOptionAddSecondOption2() { + testWithOptionAddSecondOption("test2", "test1"); + } + + private void testWithOptionAddSecondOption(String option1, String option2) { + AttributeDescription ad1 = AttributeDescription.valueOf("cn;" + option1); + AttributeDescription ad2 = ad1.withOption(option2); + assertOptions(ad2, option1, option2); assertFalse(ad2.hasOption("dummy")); - assertEquals(ad2.toString(), "cn;test1;test2"); - Iterator i = ad2.getOptions().iterator(); - assertEquals(i.next(), "test1"); - assertEquals(i.next(), "test2"); + assertEquals(ad2.toString(), toAttributeDescriptionString("cn", option1, option2)); } @Test @@ -318,6 +321,24 @@ public void testWithOptionAddExistingSecondOption() { assertSame(ad1, ad3); } + @Test + public void testWithOptionAddMultipleOptions() { + AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2"); + AttributeDescription ad2 = ad1.withOption("test4").withOption("test3"); + assertOptions(ad2, "test1", "test2", "test4", "test3"); + assertFalse(ad2.hasOption("dummy")); + assertEquals(ad2.toString(), "cn;test1;test2;test4;test3"); + } + + @Test + public void testWithOptionAddMultipleOptions2() { + AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2"); + AttributeDescription ad2 = ad1.withOption("test0"); + assertOptions(ad2, "test1", "test2", "test0"); + assertFalse(ad2.hasOption("dummy")); + assertEquals(ad2.toString(), "cn;test1;test2;test0"); + } + @Test public void testWithoutOptionEmpty() { AttributeDescription ad1 = AttributeDescription.valueOf("cn"); @@ -329,10 +350,9 @@ public void testWithoutOptionEmpty() { public void testWithoutOptionFirstOption() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test"); AttributeDescription ad2 = ad1.withoutOption("test"); - assertFalse(ad2.hasOptions()); + assertOptions(ad2); assertFalse(ad2.hasOption("test")); assertEquals(ad2.toString(), "cn"); - assertFalse(ad2.getOptions().iterator().hasNext()); } @Test @@ -346,22 +366,18 @@ public void testWithoutOptionFirstOptionMissing() { public void testWithoutOptionSecondOption1() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2"); AttributeDescription ad2 = ad1.withoutOption("test1"); - assertTrue(ad2.hasOptions()); + assertOptions(ad2, "test2"); assertFalse(ad2.hasOption("test1")); - assertTrue(ad2.hasOption("test2")); assertEquals(ad2.toString(), "cn;test2"); - assertEquals(ad2.getOptions().iterator().next(), "test2"); } @Test public void testWithoutOptionSecondOption2() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2"); AttributeDescription ad2 = ad1.withoutOption("test2"); - assertTrue(ad2.hasOptions()); - assertTrue(ad2.hasOption("test1")); + assertOptions(ad2, "test1"); assertFalse(ad2.hasOption("test2")); assertEquals(ad2.toString(), "cn;test1"); - assertEquals(ad2.getOptions().iterator().next(), "test1"); } @Test @@ -375,42 +391,27 @@ public void testWithoutOptionSecondOptionMissing() { public void testWithoutOptionThirdOption1() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2;test3"); AttributeDescription ad2 = ad1.withoutOption("test1"); - assertTrue(ad2.hasOptions()); + assertOptions(ad2, "test2", "test3"); assertFalse(ad2.hasOption("test1")); - assertTrue(ad2.hasOption("test2")); - assertTrue(ad2.hasOption("test3")); assertEquals(ad2.toString(), "cn;test2;test3"); - Iterator i = ad2.getOptions().iterator(); - assertEquals(i.next(), "test2"); - assertEquals(i.next(), "test3"); } @Test public void testWithoutOptionThirdOption2() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2;test3"); AttributeDescription ad2 = ad1.withoutOption("test2"); - assertTrue(ad2.hasOptions()); - assertTrue(ad2.hasOption("test1")); + assertOptions(ad2, "test1", "test3"); assertFalse(ad2.hasOption("test2")); - assertTrue(ad2.hasOption("test3")); assertEquals(ad2.toString(), "cn;test1;test3"); - Iterator i = ad2.getOptions().iterator(); - assertEquals(i.next(), "test1"); - assertEquals(i.next(), "test3"); } @Test public void testWithoutOptionThirdOption3() { AttributeDescription ad1 = AttributeDescription.valueOf("cn;test1;test2;test3"); AttributeDescription ad2 = ad1.withoutOption("test3"); - assertTrue(ad2.hasOptions()); - assertTrue(ad2.hasOption("test1")); - assertTrue(ad2.hasOption("test2")); + assertOptions(ad2, "test1", "test2"); assertFalse(ad2.hasOption("test3")); assertEquals(ad2.toString(), "cn;test1;test2"); - Iterator i = ad2.getOptions().iterator(); - assertEquals(i.next(), "test1"); - assertEquals(i.next(), "test2"); } @Test @@ -419,4 +420,125 @@ public void testWithoutOptionThirdOptionMissing() { AttributeDescription ad2 = ad1.withoutOption("dummy"); assertSame(ad1, ad2); } + + @Test + public void testCreateAttributeType() { + Schema schema = Schema.getCoreSchema(); + AttributeType attributeType = schema.getAttributeType("cn"); + String name = attributeType.getNameOrOID(); + + assertAttributeDescriptionCreate( + AttributeDescription.create(attributeType), + name, attributeType); + } + + @Test + public void testCreateAttributeNameAndType() { + Schema schema = Schema.getCoreSchema(); + String name = "CN"; + AttributeType attributeType = schema.getAttributeType(name); + + assertAttributeDescriptionCreate( + AttributeDescription.create(name, attributeType), + name, attributeType); + } + + @Test + public void testCreateAttributeTypeAndOption() { + Schema schema = Schema.getCoreSchema(); + AttributeType attributeType = schema.getAttributeType("cn"); + String name = attributeType.getNameOrOID(); + + assertAttributeDescriptionCreate( + AttributeDescription.create(attributeType, "option"), + name, attributeType, "option"); + } + + @Test + public void testCreateAttributeNameTypeAndOption() { + Schema schema = Schema.getCoreSchema(); + String name = "CN"; + AttributeType attributeType = schema.getAttributeType(name); + + assertAttributeDescriptionCreate( + AttributeDescription.create(name, attributeType, "option"), + name, attributeType, "option"); + } + + @Test + public void testCreateAttributeTypeAndOptionsArray() { + Schema schema = Schema.getCoreSchema(); + AttributeType attributeType = schema.getAttributeType("cn"); + String name = attributeType.getNameOrOID(); + + String[] options = { "option1", "option2" }; + assertAttributeDescriptionCreate( + AttributeDescription.create(attributeType, options), + name, attributeType, options); + } + + @Test + public void testCreateAttributeNameTypeAndOptionsArray() { + Schema schema = Schema.getCoreSchema(); + String name = "CN"; + AttributeType attributeType = schema.getAttributeType(name); + + String[] options = { "option1", "option2" }; + assertAttributeDescriptionCreate( + AttributeDescription.create(name, attributeType, options), + name, attributeType, options); + } + + @Test + public void testCreateAttributeTypeAndOptionsCollection() { + Schema schema = Schema.getCoreSchema(); + AttributeType attributeType = schema.getAttributeType("cn"); + String name = attributeType.getNameOrOID(); + + String[] options = { "option1", "option2" }; + assertAttributeDescriptionCreate( + AttributeDescription.create(attributeType, Arrays.asList(options)), + name, attributeType, options); + } + + @Test + public void testCreateAttributeNameTypeAndNoOptionsCollection() { + testCreateAttributeNameTypeAndOptionsCollection(); + } + + @Test + public void testCreateAttributeNameTypeAndOneOptionCollection() { + testCreateAttributeNameTypeAndOptionsCollection("option"); + } + + @Test + public void testCreateAttributeNameTypeAndTwoOptionsCollection() { + testCreateAttributeNameTypeAndOptionsCollection("option1", "option2"); + } + + private void testCreateAttributeNameTypeAndOptionsCollection(String... options) { + Schema schema = Schema.getCoreSchema(); + String name = "CN"; + AttributeType attributeType = schema.getAttributeType(name); + + assertAttributeDescriptionCreate( + AttributeDescription.create(name, attributeType, Arrays.asList(options)), + name, attributeType, options); + } + + private void assertAttributeDescriptionCreate(AttributeDescription attrDesc, + String name, AttributeType attributeType, String... options) { + assertEquals(attrDesc.getAttributeType(), attributeType); + assertEquals(attrDesc.getNameOrOID(), name); + assertOptions(attrDesc, options); + assertEquals(attrDesc.toString(), toAttributeDescriptionString(name, options)); + } + + private String toAttributeDescriptionString(String name, String... options) { + StringBuilder sb = new StringBuilder(name); + for (String option : options) { + sb.append(";").append(option); + } + return sb.toString(); + } } From b8a79cfe7536836b213bccc14f053dc72f2060ac Mon Sep 17 00:00:00 2001 From: "ian.packer" Date: Mon, 14 Mar 2016 16:18:12 +0000 Subject: [PATCH 103/125] OPENDJSDK-92 Update diffEntries to ensure DiffOptions replaceSingleValuedAttributes() has the expected effect This commit fixes the usage of 'useReplaceMaxValues' to match its description and amends the unit test for testDiffEntriesReplaceSingleValue --- .../src/main/java/org/forgerock/opendj/ldap/Entries.java | 2 +- .../test/java/org/forgerock/opendj/ldap/EntriesTestCase.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java index 7af499813..d21689819 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java @@ -571,7 +571,7 @@ public static ModifyRequest diffEntries(final Entry fromEntry, final Entry toEnt final int cmp = adfrom.compareTo(adto); if (cmp == 0) { /* Attribute is in both entries so compute the differences between the old and new. */ - if (options.useReplaceMaxValues > ato.size()) { + if (options.useReplaceMaxValues >= ato.size()) { // This attribute is a candidate for replacing. if (diffAttributeNeedsReplacing(afrom, ato, options)) { request.addModification(new Modification(ModificationType.REPLACE, ato)); diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java index 46537a829..a78ee9336 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java @@ -12,7 +12,7 @@ * information: "Portions Copyright [year] [name of copyright owner]". * * Copyright 2009-2010 Sun Microsystems, Inc. - * Portions copyright 2014 ForgeRock AS. + * Portions copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap; @@ -424,7 +424,7 @@ public void testDiffEntriesReplaceSingleValue() { "replace: description", "description: to"); // @formatter:on - assertEquals(diffEntries(from, to, diffOptions().alwaysReplaceAttributes()), expected); + assertEquals(diffEntries(from, to, diffOptions().replaceSingleValuedAttributes()), expected); } @Test From c5c0fc885acad472bf6bc6189d0329361ccf9d31 Mon Sep 17 00:00:00 2001 From: "ian.packer" Date: Thu, 31 Mar 2016 16:02:21 +0100 Subject: [PATCH 104/125] OPENDJ-2814 return false when BooleanSyntax valueIsAcceptable fails Also add a unit test to cover this --- .../opendj/ldap/schema/BooleanSyntaxImpl.java | 14 ++--- .../opendj/ldap/schema/BooleanSyntaxTest.java | 52 +++++++++++++++++++ 2 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java index a6b662428..c8feaaa77 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java @@ -50,13 +50,15 @@ public boolean isHumanReadable() { @Override public boolean valueIsAcceptable(final Schema schema, final ByteSequence value, final LocalizableMessageBuilder invalidReason) { - final String valueString = value.toString().toUpperCase(); + final String valueString = value.toString(); + final String valueUpperCase = valueString.toUpperCase(); - if (!"TRUE".equals(valueString) && !"YES".equals(valueString) - && !"ON".equals(valueString) && !"1".equals(valueString) - && !"FALSE".equals(valueString) && !"NO".equals(valueString) - && !"OFF".equals(valueString) && !"0".equals(valueString)) { - invalidReason.append(WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(value.toString())); + if (!"TRUE".equals(valueUpperCase) && !"YES".equals(valueUpperCase) + && !"ON".equals(valueUpperCase) && !"1".equals(valueUpperCase) + && !"FALSE".equals(valueUpperCase) && !"NO".equals(valueUpperCase) + && !"OFF".equals(valueUpperCase) && !"0".equals(valueUpperCase)) { + invalidReason.append(WARN_ATTR_SYNTAX_ILLEGAL_BOOLEAN.get(valueString)); + return false; } return true; } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java new file mode 100644 index 000000000..c283de39f --- /dev/null +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java @@ -0,0 +1,52 @@ +/* + * The contents of this file are subject to the terms of the Common Development and + * Distribution License (the License). You may not use this file except in compliance with the + * License. + * + * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the + * specific language governing permission and limitations under the License. + * + * When distributing Covered Software, include this CDDL Header Notice in each file and include + * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL + * Header, with the fields enclosed by brackets [] replaced by your own identifying + * information: "Portions Copyright [year] [name of copyright owner]". + * + * Copyright 2016 ForgeRock AS. + */ +package org.forgerock.opendj.ldap.schema; + +import static org.forgerock.opendj.ldap.schema.SchemaConstants.SYNTAX_BOOLEAN_OID; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +/** Boolean syntax tests. */ +@Test +public class BooleanSyntaxTest extends AbstractSyntaxTestCase { + @Override + @DataProvider(name = "acceptableValues") + public Object[][] createAcceptableValues() { + return new Object[][] { + { "TRUE", true }, + { "FALSE", true }, + { "true", true }, + { "false", true }, + { "YES", true }, + { "NO", true }, + { "ON", true }, + { "OFF", true }, + { "1", true }, + { "0", true }, + { "'0'B", false }, + { "invalidtrue", false }, + { " true", false }, + { "NOT", false }, + { "'010100000111111010101000'B", false } + }; + } + + @Override + protected Syntax getRule() { + return Schema.getCoreSchema().getSyntax(SYNTAX_BOOLEAN_OID); + } +} From a5f46e9ff1e7ed75621f23d874e791f06ceb06e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Rouvignac?= Date: Mon, 4 Apr 2016 11:01:43 +0200 Subject: [PATCH 105/125] Remove deprecated AttributeType.getNormalizedNameOrOID() It had been temporarily added to ease migration to AttributeType --- .../opendj/ldap/schema/AttributeType.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java index 1843236ef..8cfa8245f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java @@ -582,21 +582,6 @@ public String getNameOrOID() { return names.get(0); } - /** - * Returns the normalized name or OID for this schema definition. - *

    - * If it has one or more names, then the lower case primary name will be returned. - * If it does not have any names, then the lower case OID will be returned. - * - * @return The normalized name or OID for this schema definition. - * @deprecated This method may be removed at any time - * @since OPENDJ-1632 Migrate AttributeType in one shot - */ - @Deprecated - public String getNormalizedNameOrOID() { - return normalizedName; - } - /** * Returns an unmodifiable list containing the user-defined names that may * be used to reference this schema definition. From f924346d2388aa1710bf91a74827dc3cec50df96 Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Thu, 7 Apr 2016 00:27:00 +0200 Subject: [PATCH 106/125] OPENDJSDK-97 Support enumerations in Syntax builder * delegate construction of enumeration syntax and matching rule to Syntax.Builder#addToSchema(boolean) and route all construction paths through this method in order to have consistent behavior * add user friendly name for enumeration matching rules and ensure that removal uses the OID rather than the name * fix unit tests which were dependent on previous broken behavior. --- .../opendj/ldap/schema/EnumSyntaxImpl.java | 2 - .../opendj/ldap/schema/SchemaBuilder.java | 66 +---- .../forgerock/opendj/ldap/schema/Syntax.java | 28 +- .../ldap/schema/SchemaBuilderTestCase.java | 167 +++++++++++ .../opendj/ldap/schema/SyntaxTestCase.java | 271 +++++------------- 5 files changed, 261 insertions(+), 273 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java index 80356107a..ab7807a55 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java @@ -33,7 +33,6 @@ import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.opendj.ldap.ByteSequence; import org.forgerock.opendj.ldap.ByteString; -import org.forgerock.util.Reject; /** * This class provides an enumeration-based mechanism where a new syntax and its @@ -46,7 +45,6 @@ final class EnumSyntaxImpl extends AbstractSyntaxImpl { private final List entries; EnumSyntaxImpl(final String oid, final List entries) { - Reject.ifNull(oid, entries); this.oid = oid; final List entryStrings = new ArrayList<>(entries.size()); diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java index 1a19fcaeb..75de66164 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java @@ -31,7 +31,6 @@ import static com.forgerock.opendj.util.StaticUtils.*; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -615,33 +614,10 @@ public SchemaBuilder addDITStructureRule(final String definition, final boolean public SchemaBuilder addEnumerationSyntax(final String oid, final String description, final boolean overwrite, final String... enumerations) { Reject.ifNull((Object) enumerations); - lazyInitBuilder(); - - final List enumEntries = Arrays.asList(enumerations); - final Syntax.Builder syntaxBuilder = buildSyntax(oid).description(description) - .extraProperties(Collections.singletonMap("X-ENUM", enumEntries)); - addEnumerationSyntax0(syntaxBuilder, oid, enumEntries, overwrite); - return this; - } - - private void addEnumerationSyntax0(final Syntax.Builder syntaxBuilder, - final String oid, final List enumEntries, final boolean overwrite) { - final EnumSyntaxImpl enumImpl = new EnumSyntaxImpl(oid, enumEntries); - - syntaxBuilder - .implementation(enumImpl) + return buildSyntax(oid) + .description(description) + .extraProperties("X-ENUM", enumerations) .addToSchema(overwrite); - - try { - buildMatchingRule(enumImpl.getOrderingMatchingRule()) - .names(OMR_GENERIC_ENUM_NAME + "." + oid) - .syntaxOID(oid) - .extraProperties(CoreSchemaImpl.OPENDS_ORIGIN) - .implementation(new EnumOrderingMatchingRule(enumImpl)) - .addToSchemaOverwrite(); - } catch (final ConflictingSchemaElementException e) { - removeSyntax(oid); - } } /** @@ -1400,15 +1376,10 @@ public SchemaBuilder addObjectClass(final String definition, final boolean overw public SchemaBuilder addPatternSyntax(final String oid, final String description, final Pattern pattern, final boolean overwrite) { Reject.ifNull(pattern); - - lazyInitBuilder(); - - final Syntax.Builder syntaxBuilder = buildSyntax(oid).description(description).extraProperties( - Collections.singletonMap("X-PATTERN", Collections.singletonList(pattern.toString()))); - - syntaxBuilder.addToSchema(overwrite); - - return this; + return buildSyntax(oid) + .description(description) + .extraProperties("X-PATTERN", pattern.toString()) + .addToSchema(overwrite); } /** @@ -1726,15 +1697,10 @@ public Promise apply(SearchResultEntry result) thr public SchemaBuilder addSubstitutionSyntax(final String oid, final String description, final String substituteSyntax, final boolean overwrite) { Reject.ifNull(substituteSyntax); - - lazyInitBuilder(); - - final Syntax.Builder syntaxBuilder = buildSyntax(oid).description(description).extraProperties( - Collections.singletonMap("X-SUBST", Collections.singletonList(substituteSyntax))); - - syntaxBuilder.addToSchema(overwrite); - - return this; + return buildSyntax(oid) + .description(description) + .extraProperties("X-SUBST", substituteSyntax) + .addToSchema(overwrite); } /** @@ -1821,14 +1787,6 @@ public SchemaBuilder addSyntax(final String definition, final boolean overwrite) } } - // See if it is a enum syntax - for (final Map.Entry> property : syntaxBuilder.getExtraProperties().entrySet()) { - if ("x-enum".equalsIgnoreCase(property.getKey())) { - addEnumerationSyntax0(syntaxBuilder, oid, property.getValue(), overwrite); - return this; - } - } - syntaxBuilder.addToSchema(overwrite); } catch (final DecodeException e) { final LocalizableMessage msg = @@ -2557,7 +2515,7 @@ private void removeObjectClass(final ObjectClass oc) { private void removeSyntax(final Syntax syntax) { for (Map.Entry> property : syntax.getExtraProperties().entrySet()) { if ("x-enum".equalsIgnoreCase(property.getKey())) { - removeMatchingRule(OMR_GENERIC_ENUM_NAME + "." + syntax.getOID()); + removeMatchingRule(OMR_OID_GENERIC_ENUM + "." + syntax.getOID()); break; } } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java index cc706c4b8..473efde17 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java @@ -72,7 +72,7 @@ public static final class Builder extends SchemaElementBuilder { * If there is an existing syntax with the same numeric OID. */ public SchemaBuilder addToSchema() { - return getSchemaBuilder().addSyntax(new Syntax(this), false); + return addToSchema(false); } /** @@ -81,19 +81,25 @@ public SchemaBuilder addToSchema() { * @return The parent schema builder. */ public SchemaBuilder addToSchemaOverwrite() { - return getSchemaBuilder().addSyntax(new Syntax(this), true); + return addToSchema(true); } - /** - * Adds this syntax to the schema - overwriting any existing syntax with the same numeric OID - * if the overwrite parameter is set to {@code true}. - * - * @param overwrite - * {@code true} if any syntax with the same OID should be overwritten. - * @return The parent schema builder. - */ SchemaBuilder addToSchema(final boolean overwrite) { - return overwrite ? addToSchemaOverwrite() : addToSchema(); + // Enumeration syntaxes will need their associated matching rule registered now as well. + for (final Map.Entry> property : getExtraProperties().entrySet()) { + if ("x-enum".equalsIgnoreCase(property.getKey())) { + final EnumSyntaxImpl enumSyntaxImpl = new EnumSyntaxImpl(oid, property.getValue()); + implementation(enumSyntaxImpl); + return getSchemaBuilder().addSyntax(new Syntax(this), overwrite) + .buildMatchingRule(enumSyntaxImpl.getOrderingMatchingRule()) + .description(getDescription() + " enumeration ordering matching rule") + .syntaxOID(oid) + .extraProperties(CoreSchemaImpl.OPENDS_ORIGIN) + .implementation(new EnumOrderingMatchingRule(enumSyntaxImpl)) + .addToSchemaOverwrite(); + } + } + return getSchemaBuilder().addSyntax(new Syntax(this), overwrite); } @Override diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java index af5cf034a..f097bf2fc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java @@ -26,6 +26,7 @@ import static org.mockito.Mockito.*; import java.util.ArrayList; +import java.util.regex.Pattern; import org.forgerock.i18n.LocalizableMessageBuilder; import org.forgerock.i18n.LocalizedIllegalArgumentException; @@ -40,6 +41,7 @@ import org.forgerock.opendj.ldap.requests.SearchRequest; import org.forgerock.opendj.ldap.responses.Responses; import org.forgerock.opendj.ldap.responses.SearchResultEntry; +import org.testng.annotations.DataProvider; import org.testng.annotations.Test; /** Test SchemaBuilder. */ @@ -2158,4 +2160,169 @@ public void attributeTypesUseNewlyBuiltSyntaxes() throws Exception { .as("Value should have been valid, but it is not: " + invalidReason.toString()) .isTrue(); } + + @DataProvider + private Object[][] schemasWithEnumerationSyntaxes() { + final Schema coreSchema = Schema.getCoreSchema(); + + final Schema usingAddEnumerationSyntax = new SchemaBuilder("usingAddEnumerationSyntax") + .addSchema(coreSchema, true) + .addEnumerationSyntax("3.3.3", "Primary colors", true, "red", "green", "blue") + .toSchema(); + + final Schema usingAddSyntaxString = new SchemaBuilder("usingAddSyntaxString") + .addSchema(coreSchema, true) + .addSyntax("( 3.3.3 DESC 'Primary colors' X-ENUM ( 'red' 'green' 'blue' ))", true) + .toSchema(); + + final Schema usingBuildSyntaxCopy = new SchemaBuilder("usingBuildSyntaxCopy") + .addSchema(coreSchema, true) + .buildSyntax(usingAddEnumerationSyntax.getSyntax("3.3.3")).addToSchema() + .toSchema(); + + final Schema usingBuildSyntaxIncremental = new SchemaBuilder("usingBuildSyntaxIncremental") + .addSchema(coreSchema, true) + .buildSyntax("3.3.3") + .description("Primary colors") + .extraProperties("X-ENUM", "red", "green", "blue") + .addToSchema() + .toSchema(); + + final Schema usingCopyOfSchema = new SchemaBuilder("usingCopyOfSchema") + .addSchema(usingAddEnumerationSyntax, true) + .toSchema(); + + return new Object[][] { + { usingAddEnumerationSyntax }, + { usingAddSyntaxString }, + { usingBuildSyntaxCopy }, + { usingBuildSyntaxIncremental }, + { usingCopyOfSchema } + }; + } + + @Test(dataProvider = "schemasWithEnumerationSyntaxes") + public void enumerationSyntaxesCanBeCreatedUsingDifferentApproaches(Schema schema) { + assertThat(schema.getWarnings()).isEmpty(); + assertThat(schema.getMatchingRules()) + .as("Expected an enum ordering matching rule to be added for the enum syntax") + .hasSize(Schema.getCoreSchema().getMatchingRules().size() + 1); + + LocalizableMessageBuilder msgBuilder = new LocalizableMessageBuilder(); + Syntax primaryColors = schema.getSyntax("3.3.3"); + assertThat(primaryColors.valueIsAcceptable(ByteString.valueOfUtf8("red"), msgBuilder)).isTrue(); + assertThat(primaryColors.valueIsAcceptable(ByteString.valueOfUtf8("yellow"), msgBuilder)).isFalse(); + + MatchingRule matchingRule = schema.getMatchingRule(OMR_OID_GENERIC_ENUM + "." + "3.3.3"); + assertThat(matchingRule).isNotNull(); + assertThat(matchingRule).isSameAs(primaryColors.getOrderingMatchingRule()); + } + + @DataProvider + private Object[][] schemasWithSubstitutionSyntaxes() { + final Schema coreSchema = Schema.getCoreSchema(); + + final Schema usingAddSubstitutionSyntax = new SchemaBuilder("usingAddSubstitutionSyntax") + .addSchema(coreSchema, true) + .addSubstitutionSyntax("3.3.3", "Long Integer", "1.3.6.1.4.1.1466.115.121.1.27", true) + .toSchema(); + + final Schema usingAddSyntaxString = new SchemaBuilder("usingAddSyntaxString") + .addSchema(coreSchema, true) + .addSyntax("( 3.3.3 DESC 'Long Integer' X-SUBST '1.3.6.1.4.1.1466.115.121.1.27' )", true) + .toSchema(); + + final Schema usingBuildSyntaxCopy = new SchemaBuilder("usingBuildSyntaxCopy") + .addSchema(coreSchema, true) + .buildSyntax(usingAddSubstitutionSyntax.getSyntax("3.3.3")).addToSchema() + .toSchema(); + + final Schema usingBuildSyntaxIncremental = new SchemaBuilder("usingBuildSyntaxIncremental") + .addSchema(coreSchema, true) + .buildSyntax("3.3.3") + .description("Long Integer") + .extraProperties("X-SUBST", "1.3.6.1.4.1.1466.115.121.1.27") + .addToSchema() + .toSchema(); + + final Schema usingCopyOfSchema = new SchemaBuilder("usingCopyOfSchema") + .addSchema(usingAddSubstitutionSyntax, true) + .toSchema(); + + return new Object[][] { + { usingAddSubstitutionSyntax }, + { usingAddSyntaxString }, + { usingBuildSyntaxCopy }, + { usingBuildSyntaxIncremental }, + { usingCopyOfSchema } + }; + } + + @Test(dataProvider = "schemasWithSubstitutionSyntaxes") + public void substitutionSyntaxesCanBeCreatedUsingDifferentApproaches(Schema schema) { + assertThat(schema.getWarnings()).isEmpty(); + + LocalizableMessageBuilder msgBuilder = new LocalizableMessageBuilder(); + Syntax longInteger = schema.getSyntax("3.3.3"); + assertThat(longInteger.valueIsAcceptable(ByteString.valueOfUtf8("12345"), msgBuilder)).isTrue(); + assertThat(longInteger.valueIsAcceptable(ByteString.valueOfUtf8("NaN"), msgBuilder)).isFalse(); + + MatchingRule matchingRule = schema.getMatchingRule("integerOrderingMatch"); + assertThat(matchingRule).isNotNull(); + assertThat(matchingRule).isSameAs(longInteger.getOrderingMatchingRule()); + } + + @DataProvider + private Object[][] schemasWithPatternSyntaxes() { + final Schema coreSchema = Schema.getCoreSchema(); + + final Schema usingAddPatternSyntax = new SchemaBuilder("usingAddSubstitutionSyntax") + .addSchema(coreSchema, true) + .addPatternSyntax("3.3.3", "Host and Port", Pattern.compile("[^:]+:\\d+"), true) + .toSchema(); + + final Schema usingAddSyntaxString = new SchemaBuilder("usingAddSyntaxString") + .addSchema(coreSchema, true) + .addSyntax("( 3.3.3 DESC 'Host and Port' X-PATTERN '[^:]+:\\d+' )", true) + .toSchema(); + + final Schema usingBuildSyntaxCopy = new SchemaBuilder("usingBuildSyntaxCopy") + .addSchema(coreSchema, true) + .buildSyntax(usingAddPatternSyntax.getSyntax("3.3.3")).addToSchema() + .toSchema(); + + final Schema usingBuildSyntaxIncremental = new SchemaBuilder("usingBuildSyntaxIncremental") + .addSchema(coreSchema, true) + .buildSyntax("3.3.3") + .description("Host and Port") + .extraProperties("X-PATTERN", "[^:]+:\\d+") + .addToSchema() + .toSchema(); + + final Schema usingCopyOfSchema = new SchemaBuilder("usingCopyOfSchema") + .addSchema(usingAddPatternSyntax, true) + .toSchema(); + + return new Object[][] { + { usingAddPatternSyntax }, + { usingAddSyntaxString }, + { usingBuildSyntaxCopy }, + { usingBuildSyntaxIncremental }, + { usingCopyOfSchema } + }; + } + + @Test(dataProvider = "schemasWithPatternSyntaxes") + public void patternSyntaxesCanBeCreatedUsingDifferentApproaches(Schema schema) { + assertThat(schema.getWarnings()).isEmpty(); + + LocalizableMessageBuilder msgBuilder = new LocalizableMessageBuilder(); + Syntax longInteger = schema.getSyntax("3.3.3"); + assertThat(longInteger.valueIsAcceptable(ByteString.valueOfUtf8("localhost:389"), msgBuilder)).isTrue(); + assertThat(longInteger.valueIsAcceptable(ByteString.valueOfUtf8("bad"), msgBuilder)).isFalse(); + + MatchingRule matchingRule = schema.getMatchingRule("caseIgnoreOrderingMatch"); + assertThat(matchingRule).isNotNull(); + assertThat(matchingRule).isSameAs(longInteger.getOrderingMatchingRule()); + } } diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java index 6c6f83d18..f402050d1 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. * Portions Copyright 2014 Manuel Gaupp */ @@ -30,34 +30,32 @@ public class SyntaxTestCase extends AbstractSchemaTestCase { @Test - public final void testCreatesANewSyntax() { + public final void testBuilderCreatesCustomSyntax() { // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new DirectoryStringSyntaxImpl()) - .addToSchema() + .description("Security Label") + .extraProperties("X-TEST", "1", "2", "3") + .implementation(new DirectoryStringSyntaxImpl()) + .addToSchema() .toSchema(); // @formatter:on assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); assertThat(syntax.getDescription()).isEqualTo("Security Label"); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); + assertThat(syntax.getExtraProperties().get("X-TEST")).hasSize(3); assertThat(syntax.getApproximateMatchingRule().getNameOrOID()).isEqualTo("ds-mr-double-metaphone-approx"); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreMatch"); assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreOrderingMatch"); assertThat(syntax.getSubstringMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreSubstringsMatch"); - assertThat(syntax.toString()).isEqualTo( - "( 1.9.1.2.3 DESC 'Security Label' X-ENUM ( 'top-secret' 'secret' 'confidential' ) )"); + assertThat(syntax.toString()).isEqualTo("( 1.9.1.2.3 DESC 'Security Label' X-TEST ( '1' '2' '3' ) )"); assertThat(syntax.isHumanReadable()).isTrue(); assertThat(syntax.isBEREncodingRequired()).isFalse(); } /** - * Tests that unrecognized syntaxes are automatically substituted with the - * default syntax during building. + * Tests that unrecognized syntaxes are automatically substituted with the default syntax during building. */ @Test public final void testBuilderSubstitutesUnknownSyntaxWithDefaultSyntax() { @@ -70,14 +68,12 @@ public final void testBuilderSubstitutesUnknownSyntaxWithDefaultSyntax() { assertThat(syntax.getDescription()).isEmpty(); assertThat(syntax.getApproximateMatchingRule()).isNull(); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo( - "octetStringOrderingMatch"); + assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); assertThat(syntax.getSubstringMatchingRule()).isNull(); } /** - * Tests that unrecognized syntaxes are automatically substituted with the - * default syntax and matching rule. + * Tests that unrecognized syntaxes are automatically substituted with the default syntax and matching rule. */ @Test public final void testDefaultSyntaxSubstitution() { @@ -85,12 +81,10 @@ public final void testDefaultSyntaxSubstitution() { assertThat(syntax).isNotNull(); assertThat(syntax.getDescription()).isEmpty(); // Dynamically created syntaxes include the X-SUBST extension. - assertThat(syntax.getExtraProperties().get("X-SUBST").get(0)).isEqualTo( - "1.3.6.1.4.1.1466.115.121.1.40"); + assertThat(syntax.getExtraProperties().get("X-SUBST").get(0)).isEqualTo("1.3.6.1.4.1.1466.115.121.1.40"); assertThat(syntax.getApproximateMatchingRule()).isNull(); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo( - "octetStringOrderingMatch"); + assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); assertThat(syntax.getSubstringMatchingRule()).isNull(); } @@ -99,14 +93,7 @@ public final void testDefaultSyntaxSubstitution() { */ @Test(expectedExceptions = IllegalArgumentException.class) public final void testBuilderDoesNotAllowEmptyOid() { - // @formatter:off - new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new DirectoryStringSyntaxImpl()) - .addToSchema(); - // @formatter:on + new SchemaBuilder(Schema.getCoreSchema()).buildSyntax("").addToSchema(); } /** @@ -114,14 +101,7 @@ public final void testBuilderDoesNotAllowEmptyOid() { */ @Test(expectedExceptions = IllegalArgumentException.class) public final void testBuilderDoesNotAllowNullOid() { - // @formatter:off - new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax((String) null) - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new DirectoryStringSyntaxImpl()) - .addToSchema(); - // @formatter:on + new SchemaBuilder(Schema.getCoreSchema()).buildSyntax((String) null).addToSchema(); } /** @@ -129,28 +109,19 @@ public final void testBuilderDoesNotAllowNullOid() { */ @Test public final void testBuilderAllowsNullSyntax() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(null) - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").implementation(null).addToSchema() + .toSchema(); assertThat(schema.getWarnings()).isNotEmpty(); assertThat(schema.getWarnings().toString()).contains("It will be substituted by the default syntax"); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); - assertThat(syntax.toString()).isEqualTo( - "( 1.9.1.2.3 DESC 'Security Label' X-ENUM ( 'top-secret' 'secret' 'confidential' ) )"); + assertThat(syntax.toString()).isEqualTo("( 1.9.1.2.3 )"); } /** @@ -158,27 +129,19 @@ public final void testBuilderAllowsNullSyntax() { */ @Test public final void testBuilderAllowsNoSyntax() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").addToSchema() + .toSchema(); assertThat(schema.getWarnings()).isNotEmpty(); assertThat(schema.getWarnings().toString()).contains("It will be substituted by the default syntax"); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); - assertThat(syntax.toString()).isEqualTo( - "( 1.9.1.2.3 DESC 'Security Label' X-ENUM ( 'top-secret' 'secret' 'confidential' ) )"); + assertThat(syntax.toString()).isEqualTo("( 1.9.1.2.3 )"); } /** @@ -187,28 +150,20 @@ public final void testBuilderAllowsNoSyntax() { */ @Test public final void testBuilderAllowsNoSyntaxCaseWhereDefaultSyntaxIsChanged() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .setOption(DEFAULT_SYNTAX_OID, "1.3.6.1.4.1.1466.115.121.1.15") - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .addToSchema() - .toSchema(); - // @formatter:on + .setOption(DEFAULT_SYNTAX_OID, "1.3.6.1.4.1.1466.115.121.1.15") + .buildSyntax("1.9.1.2.3").addToSchema() + .toSchema(); assertThat(schema.getWarnings()).isNotEmpty(); assertThat(schema.getWarnings().toString()).contains("It will be substituted by the default syntax"); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); assertThat(syntax.getApproximateMatchingRule().getNameOrOID()).isEqualTo("ds-mr-double-metaphone-approx"); assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreMatch"); assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreOrderingMatch"); assertThat(syntax.getSubstringMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreSubstringsMatch"); - assertThat(syntax.toString()).isEqualTo( - "( 1.9.1.2.3 DESC 'Security Label' X-ENUM ( 'top-secret' 'secret' 'confidential' ) )"); + assertThat(syntax.toString()).isEqualTo("( 1.9.1.2.3 )"); } /** @@ -216,24 +171,13 @@ public final void testBuilderAllowsNoSyntaxCaseWhereDefaultSyntaxIsChanged() { */ @Test public final void testBuilderAllowsNoDescription() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new OctetStringSyntaxImpl()) - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").addToSchema() + .toSchema(); - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); assertThat(syntax.getDescription()).isEqualTo(""); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } /** @@ -241,25 +185,13 @@ public final void testBuilderAllowsNoDescription() { */ @Test public final void testBuilderAllowsNullDescription() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description(null) - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new OctetStringSyntaxImpl()) - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").description(null).addToSchema() + .toSchema(); - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); assertThat(syntax.getDescription()).isEqualTo(""); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } /** @@ -267,25 +199,13 @@ public final void testBuilderAllowsNullDescription() { */ @Test public final void testBuilderAllowsEmptyDescription() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new OctetStringSyntaxImpl()) - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").description("").addToSchema() + .toSchema(); - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); assertThat(syntax.getDescription()).isEqualTo(""); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } /** @@ -293,24 +213,13 @@ public final void testBuilderAllowsEmptyDescription() { */ @Test public final void testBuilderAllowsNoExtraProperties() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .implementation(new OctetStringSyntaxImpl()) - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3").addToSchema() + .toSchema(); - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); assertThat(syntax.getExtraProperties().isEmpty()).isTrue(); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } /** @@ -318,15 +227,7 @@ public final void testBuilderAllowsNoExtraProperties() { */ @Test(expectedExceptions = NullPointerException.class) public final void testBuilderDoesNotAllowNullExtraProperties() { - // @formatter:off - new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties(null) - .implementation(new OctetStringSyntaxImpl()) - .addToSchema() - .toSchema(); - // @formatter:on + new SchemaBuilder(Schema.getCoreSchema()).buildSyntax("1.9.1.2.3").extraProperties(null); } /** @@ -334,26 +235,14 @@ public final void testBuilderDoesNotAllowNullExtraProperties() { */ @Test public final void testBuilderRemoveExtraProperties() { - // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) - .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new OctetStringSyntaxImpl()) - .removeAllExtraProperties() - .addToSchema() - .toSchema(); - // @formatter:on + .buildSyntax("1.9.1.2.3") + .extraProperties("X-ENUM", "1", "2", "3").removeAllExtraProperties().addToSchema() + .toSchema(); - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); assertThat(syntax.getExtraProperties().isEmpty()).isTrue(); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } /** @@ -364,29 +253,20 @@ public final void testBuilderRemoveSpecifiedExtraProperties() { // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) .buildSyntax("1.9.1.2.3") - .description("Security Label") .extraProperties("X-ENUM", "top-secret", "secret", "confidential") .extraProperties("X-ORIGIN", "Sam Carter") - .implementation(new OctetStringSyntaxImpl()) .removeExtraProperty("X-ENUM", "top-secret") .addToSchema() .toSchema(); // @formatter:on - assertThat(schema.getWarnings()).isEmpty(); final Syntax syntax = schema.getSyntax("1.9.1.2.3"); assertThat(syntax).isNotNull(); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); assertThat(syntax.getExtraProperties().isEmpty()).isFalse(); assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(2); assertThat(syntax.getExtraProperties().get("X-ORIGIN").size()).isEqualTo(1); - assertThat(syntax.getApproximateMatchingRule()).isEqualTo(null); - assertThat(syntax.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); - assertThat(syntax.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); - assertThat(syntax.getSubstringMatchingRule()).isEqualTo(null); } - /** * Sets a syntax using a string definition. */ @@ -470,41 +350,20 @@ public final void testAddingUnknownSyntaxDefinitionString() { */ @Test public final void testBuilderDuplicatesExistingSyntax() { - final SchemaBuilder sb = new SchemaBuilder(); - sb.addSchema(Schema.getCoreSchema(), false); - - // @formatter:off - final Syntax.Builder syntaxBuilder = new Syntax.Builder("1.9.1.2.3", sb); - syntaxBuilder.description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new DirectoryStringSyntaxImpl()) - .addToSchema(); - // @formatter:on + final Schema schema1 = new SchemaBuilder(Schema.getCoreSchema()) + .buildSyntax("1.2.3.4.5.6").description("v1").addToSchema() + .toSchema(); - Schema schema = sb.toSchema(); - assertThat(schema.getWarnings()).isEmpty(); - final Syntax syntax = schema.getSyntax("1.9.1.2.3"); - assertThat(syntax.getDescription()).isEqualTo("Security Label"); - assertThat(syntax.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); + final Syntax syntax1 = schema1.getSyntax("1.2.3.4.5.6"); + assertThat(syntax1.getDescription()).isEqualTo("v1"); - // @formatter:off - sb.buildSyntax(syntax) - .description("Security Label II") - .extraProperties("X-ENUM", "private") - .addToSchemaOverwrite(); - // @formatter:on + final Schema schema2 = new SchemaBuilder(Schema.getCoreSchema()) + .buildSyntax(syntax1).description("v2").addToSchema() + .toSchema(); - schema = sb.toSchema(); - assertThat(schema.getWarnings()).isEmpty(); - final Syntax dolly = schema.getSyntax("1.9.1.2.3"); - assertThat(dolly.getDescription()).isEqualTo("Security Label II"); - assertThat(dolly.getExtraProperties().get("X-ENUM").size()).isEqualTo(4); - assertThat(dolly.getApproximateMatchingRule().getNameOrOID()).isEqualTo("ds-mr-double-metaphone-approx"); - assertThat(dolly.getEqualityMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreMatch"); - assertThat(dolly.getOrderingMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreOrderingMatch"); - assertThat(dolly.getSubstringMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreSubstringsMatch"); - assertThat(dolly.toString()).isEqualTo( - "( 1.9.1.2.3 DESC 'Security Label II' X-ENUM ( 'top-secret' 'secret' 'confidential' 'private' ) )"); + final Syntax syntax2 = schema2.getSyntax("1.2.3.4.5.6"); + assertThat(syntax2.getDescription()).isEqualTo("v2"); + assertThat(syntax2.toString()).isEqualTo("( 1.2.3.4.5.6 DESC 'v2' )"); } /** @@ -673,24 +532,24 @@ public final void testBuilderCreatesSyntaxesUsingChainingMethods() { // @formatter:off final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) .buildSyntax("1.9.1.2.3") - .description("Security Label") - .extraProperties("X-ENUM", "top-secret", "secret", "confidential") - .implementation(new DirectoryStringSyntaxImpl()) - .addToSchema() + .description("Security Label") + .extraProperties("X-TEST", "1", "2", "3") + .implementation(new DirectoryStringSyntaxImpl()) + .addToSchema() .buildSyntax("1.9.1.2.4") - .description("Security Label II") - .extraProperties("X-ENUM", "private") - .addToSchema() + .description("Security Label II") + .extraProperties("X-TEST", "private") + .addToSchema() .buildSyntax("non-implemented-syntax-oid") - .description("Not Implemented in OpenDJ") - .extraProperties("X-SUBST", "1.3.6.1.4.1.1466.115.121.1.15") - .implementation(null) - .addToSchema() + .description("Not Implemented in OpenDJ") + .extraProperties("X-SUBST", "1.3.6.1.4.1.1466.115.121.1.15") + .implementation(null) + .addToSchema() .buildSyntax("1.3.6.1.4.1.4203.1.1.2") - .description("Authentication Password Syntax") - .extraProperties("X-ORIGIN", "RFC 4512") - .implementation(new OctetStringSyntaxImpl()) - .addToSchemaOverwrite() + .description("Authentication Password Syntax") + .extraProperties("X-ORIGIN", "RFC 4512") + .implementation(new OctetStringSyntaxImpl()) + .addToSchemaOverwrite() .toSchema(); // @formatter:on @@ -706,12 +565,12 @@ public final void testBuilderCreatesSyntaxesUsingChainingMethods() { assertThat(s1.getEqualityMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreMatch"); assertThat(s1.getOrderingMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreOrderingMatch"); assertThat(s1.getSubstringMatchingRule().getNameOrOID()).isEqualTo("caseIgnoreSubstringsMatch"); - assertThat(s1.getExtraProperties().get("X-ENUM").size()).isEqualTo(3); + assertThat(s1.getExtraProperties().get("X-TEST")).hasSize(3); // Second final Syntax s2 = schema.getSyntax("1.9.1.2.4"); assertThat(s2.getDescription()).isEqualTo("Security Label II"); - assertThat(s2.getExtraProperties().get("X-ENUM").size()).isEqualTo(1); + assertThat(s2.getExtraProperties().get("X-TEST")).hasSize(1); assertThat(s2.getApproximateMatchingRule()).isEqualTo(null); assertThat(s2.getEqualityMatchingRule().getNameOrOID()).isEqualTo("octetStringMatch"); assertThat(s2.getOrderingMatchingRule().getNameOrOID()).isEqualTo("octetStringOrderingMatch"); From ac2509c07e08df838516f711c41b70a7258a665a Mon Sep 17 00:00:00 2001 From: Matthew Swift Date: Tue, 5 Apr 2016 22:01:24 +0200 Subject: [PATCH 107/125] OPENDJSDK-96 Add schema option for tolerating attribute type definitions without a SUP or SYNTAX * added SchemaOptions#ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX * updated SchemaBuilder/AttributeType to use the new option * updated unit tests to deal with change in behavior. --- .../opendj/ldap/schema/AttributeType.java | 24 ++++---- .../opendj/ldap/schema/SchemaBuilder.java | 2 +- .../opendj/ldap/schema/SchemaOptions.java | 12 +++- .../opendj/ldap/schema/AttributeTypeTest.java | 57 ++++++++++--------- .../ldap/schema/SchemaBuilderTestCase.java | 20 +++++-- 5 files changed, 69 insertions(+), 46 deletions(-) diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java index 8cfa8245f..601cc5298 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java @@ -19,6 +19,7 @@ import static java.util.Arrays.*; import static org.forgerock.opendj.ldap.schema.SchemaConstants.*; +import static org.forgerock.opendj.ldap.schema.SchemaOptions.ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX; import static org.forgerock.opendj.ldap.schema.SchemaUtils.*; import static com.forgerock.opendj.ldap.CoreMessages.*; @@ -97,7 +98,7 @@ public static final class Builder extends SchemaElementBuilder { * numeric OID. */ public SchemaBuilder addToSchema() { - return getSchemaBuilder().addAttributeType(new AttributeType(this), false); + return addToSchema(false); } /** @@ -107,19 +108,11 @@ public SchemaBuilder addToSchema() { * @return The parent schema builder. */ public SchemaBuilder addToSchemaOverwrite() { - return getSchemaBuilder().addAttributeType(new AttributeType(this), true); + return addToSchema(true); } - /** - * Adds this attribute type to the schema, overwriting any existing attribute type - * with the same numeric OID if the overwrite parameter is set to {@code true}. - * - * @param overwrite - * {@code true} if any attribute type with the same OID should be overwritten. - * @return The parent schema builder. - */ SchemaBuilder addToSchema(final boolean overwrite) { - return overwrite ? addToSchemaOverwrite() : addToSchema(); + return getSchemaBuilder().addAttributeType(new AttributeType(this), overwrite); } /** @@ -424,8 +417,11 @@ public Builder usage(AttributeUsage attributeUsage) { private AttributeType(Builder builder) { super(builder); Reject.ifTrue(builder.oid == null || builder.oid.isEmpty(), "An OID must be specified."); - Reject.ifTrue(builder.superiorTypeOID == null && builder.syntaxOID == null, - "Superior type and/or Syntax must not be null"); + + if (builder.superiorTypeOID == null && builder.syntaxOID == null + && !builder.getSchemaBuilder().getOptions().get(ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX)) { + throw new IllegalArgumentException("Superior type and/or Syntax must not be null"); + } oid = builder.oid; names = unmodifiableCopyOfList(builder.names); @@ -989,6 +985,8 @@ boolean validate(final Schema schema, final List invalidSchemaEle } else if (getSuperiorType() != null && getSuperiorType().getSyntax() != null) { // Try to inherit the syntax from the superior type if possible syntax = getSuperiorType().getSyntax(); + } else { + syntax = schema.getDefaultSyntax(); } if (equalityMatchingRuleOID != null) { diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java index 75de66164..f5d7301d3 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java @@ -364,7 +364,7 @@ public SchemaBuilder addAttributeType(final String definition, final boolean ove atBuilder.approximateMatchingRule(approxRules.get(0)); } - if (superiorType == null && syntax == null) { + if (superiorType == null && syntax == null && !options.get(ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX)) { throw new LocalizedIllegalArgumentException( WARN_ATTR_SYNTAX_ATTRTYPE_MISSING_SYNTAX_AND_SUPERIOR.get(definition)); } diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java index 81710c9e6..4df915f1f 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java @@ -11,7 +11,7 @@ * Header, with the fields enclosed by brackets [] replaced by your own identifying * information: "Portions Copyright [year] [name of copyright owner]". * - * Copyright 2014-2015 ForgeRock AS. + * Copyright 2014-2016 ForgeRock AS. */ package org.forgerock.opendj.ldap.schema; @@ -50,6 +50,16 @@ public final class SchemaOptions { */ public static final Option ALLOW_MALFORMED_NAMES_AND_OPTIONS = Option.withDefault(true); + /** + * Specifies whether the schema should allow attribute type definitions that do not declare a superior attribute + * type or syntax. When this compatibility option is set to {@code true} invalid attribute type definitions will + * use the default syntax specifed by the {@link #DEFAULT_SYNTAX_OID} option. + *

    + * By default this compatibility option is set to {@code true} in order to remain compatible with previous + * versions of OpenDJ. + */ + public static final Option ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX = Option.withDefault(true); + /** * Specifies whether the JPEG Photo syntax should allow values which * do not conform to the JFIF or Exif specifications. diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java index 2d285c210..c261aa08f 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java @@ -16,6 +16,7 @@ */ package org.forgerock.opendj.ldap.schema; +import static org.assertj.core.api.Assertions.assertThat; import static org.forgerock.opendj.ldap.schema.SchemaConstants.*; import java.util.Iterator; @@ -481,37 +482,39 @@ public void testIsSingleValue() throws Exception { Assert.assertFalse(type.isSingleValue()); } - /** - * Check that the simple constructor throws an NPE when mandatory parameters - * are not specified. - * - * @throws Exception - * If the test failed unexpectedly. - */ - @Test(expectedExceptions = IllegalArgumentException.class) - public void testNoSupNorSyntax1() throws Exception { - final SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema()); - builder.buildAttributeType("1.2.1") - .names(EMPTY_NAMES) - .obsolete(true) - .usage(AttributeUsage.DSA_OPERATION) - .addToSchema(); + @Test(expectedExceptions = LocalizedIllegalArgumentException.class) + public void attributeTypeDefinitionsRequireSyntaxOrSuperiorWhenStrict1() throws Exception { + new SchemaBuilder(Schema.getCoreSchema()) + .setOption(SchemaOptions.ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX, false) + .addAttributeType("(1.2.1)", true); + } - builder.addAttributeType("( 1.2.2 OBSOLETE SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE )", false); + @Test(expectedExceptions = IllegalArgumentException.class) + public void attributeTypeDefinitionsRequireSyntaxOrSuperiorWhenStrict2() throws Exception { + new SchemaBuilder(Schema.getCoreSchema()) + .setOption(SchemaOptions.ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX, false) + .buildAttributeType("1.2.1") + .addToSchema(); + } + @Test + public void attributeTypeDefinitionsDoNotRequireSyntaxOrSuperiorWhenTolerant1() throws Exception { + final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) + .addAttributeType("(1.2.1)", true).toSchema(); + assertThat(schema.getWarnings()).isEmpty(); + assertThat(schema.getAttributeType("1.2.1").getSuperiorType()).isNull(); + assertThat(schema.getAttributeType("1.2.1").getSyntax()).isSameAs(schema.getDefaultSyntax()); } - /** - * Check that the simple constructor throws an NPE when mandatory parameters - * are not specified. - * - * @throws Exception - * If the test failed unexpectedly. - */ - @Test(expectedExceptions = IllegalArgumentException.class) - public void testNoSupNorSyntax2() throws Exception { - final SchemaBuilder builder = new SchemaBuilder(Schema.getCoreSchema()); - builder.addAttributeType("( 1.2.2 OBSOLETE SINGLE-VALUE )", false); + @Test + public void attributeTypeDefinitionsDoNotRequireSyntaxOrSuperiorWhenTolerant2() throws Exception { + final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) + .buildAttributeType("1.2.1") + .addToSchema() + .toSchema(); + assertThat(schema.getWarnings()).isEmpty(); + assertThat(schema.getAttributeType("1.2.1").getSuperiorType()).isNull(); + assertThat(schema.getAttributeType("1.2.1").getSyntax()).isSameAs(schema.getDefaultSyntax()); } @Test diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java index f097bf2fc..953c591fc 100644 --- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java +++ b/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java @@ -84,11 +84,23 @@ public void attributeTypeDependenciesParentThenChild() { "1.3.6.1.4.1.1466.115.121.1.15"); } - /** Tests that attribute types must have a syntax or a superior. */ + /** Tests that attribute types must have a syntax or a superior when strict. */ @Test(expectedExceptions = LocalizedIllegalArgumentException.class) - public void attributeTypeNoSuperiorNoSyntax() { - new SchemaBuilder(Schema.getCoreSchema()).addAttributeType( - "( parenttype-oid NAME 'parenttype' )", false); + public void attributeTypeNoSuperiorNoSyntaxWhenStrict() { + new SchemaBuilder(Schema.getCoreSchema()) + .setOption(ALLOW_ATTRIBUTE_TYPES_WITH_NO_SUP_OR_SYNTAX, false) + .addAttributeType("( parenttype-oid NAME 'parenttype' )", false); + } + + /** Tests that attribute types do not have to have a syntax or a superior when leniant. */ + @Test + public void attributeTypeNoSuperiorNoSyntaxWhenLeniant() { + final Schema schema = new SchemaBuilder(Schema.getCoreSchema()) + .addAttributeType("( parenttype-oid NAME 'parenttype' )", false) + .toSchema(); + assertThat(schema.getAttributeType("parenttype").getSyntax()).isNotNull(); + assertThat(schema.getAttributeType("parenttype").getSyntax().getOID()) + .isEqualTo("1.3.6.1.4.1.1466.115.121.1.40"); } /** From 1352c313b8125d4cf806133e1dffbbabbe7424e1 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 01:34:46 +0300 Subject: [PATCH 108/125] remove clirr-maven-plugin --- opendj-core/pom.xml | 66 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/opendj-core/pom.xml b/opendj-core/pom.xml index 13077c4e2..99e59aa04 100644 --- a/opendj-core/pom.xml +++ b/opendj-core/pom.xml @@ -160,39 +160,39 @@ - - org.codehaus.mojo - clirr-maven-plugin - ${clirrPluginVersion} - true - - - - ${project.groupId} - opendj-ldap-sdk - - 3.0.0-SNAPSHOT - - - - com/** - - clirr-ignored-api-changes.xml - - - - - mvn clirr:check - - - - mvn verify - - check - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 8dd4d9dc4606a1f46446f8057a6130911652b340 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 01:43:29 +0300 Subject: [PATCH 109/125] Create .travis.yml --- .travis.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..c2b507049 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,24 @@ +language: java +matrix: + include: + - os: linux + jdk: oraclejdk8 + - os: linux + jdk: openjdk8 + - os: osx + osx_image: xcode9.1 +before_install: + - date -u + - uname -a + - env | sort +branches: + only: + - master +notifications: + email: + - support@openam.org.ru +cache: + directories: + - $HOME/.m2 +script: + - mvn -q clean install From 5f987af8df3821e8030a9d21a724f6142f78b828 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 01:47:25 +0300 Subject: [PATCH 110/125] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 2c0897b7b..c22d5c096 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,15 @@ OpenDJ SDK ========== +[![Build Status](https://travis-ci.org/OpenIdentityPlatform/OpenDJ-SDK.svg)](https://travis-ci.org/OpenIdentityPlatform/OpenDJ-SDK) + +## How-to build + +* git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git +* mvn clean install -f OpenDJ-SDK + +About +========== The **OpenDJ LDAP SDK** provides a set of modern, developer-friendly Java APIs as part of the [OpenDJ](http://opendj.forgerock.org) product suite, which is actively maintained and supported by From 71d394b5613351c4ba6d58662d45b21fdcb76ff3 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 02:07:37 +0300 Subject: [PATCH 111/125] forgerock-parent --- .gitmodules | 3 +++ forgerock-parent | 1 + opendj-sdk-bom/pom.xml | 4 ++-- pom.xml | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 forgerock-parent diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..f4f124c56 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "forgerock-parent"] + path = forgerock-parent + url = https://github.com/OpenIdentityPlatform/forgerock-parent.git diff --git a/forgerock-parent b/forgerock-parent new file mode 160000 index 000000000..f1c886e12 --- /dev/null +++ b/forgerock-parent @@ -0,0 +1 @@ +Subproject commit f1c886e121ce9c1854d8287dc302de75f95d9245 diff --git a/opendj-sdk-bom/pom.xml b/opendj-sdk-bom/pom.xml index 7f5d35a3d..1d0ff0446 100644 --- a/opendj-sdk-bom/pom.xml +++ b/opendj-sdk-bom/pom.xml @@ -20,8 +20,8 @@ org.forgerock forgerock-parent - 2.0.3 - + 2.0.6 + ../forgerock-parent org.forgerock.opendj diff --git a/pom.xml b/pom.xml index 8bb3cfe47..f4978d999 100644 --- a/pom.xml +++ b/pom.xml @@ -132,6 +132,7 @@ + forgerock-parent opendj-sdk-bom opendj-doc-maven-plugin opendj-core From a3a507e262d5614931b30798cbd0f5462a38cfd8 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 02:26:22 +0300 Subject: [PATCH 112/125] 21.0.0-SNAPSHOT --- forgerock-parent | 2 +- pom.xml | 60 ++++++++++++++++++++++++------------------------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/forgerock-parent b/forgerock-parent index f1c886e12..cf79e17ab 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit f1c886e121ce9c1854d8287dc302de75f95d9245 +Subproject commit cf79e17ab3d9746688cc0f7406125d69e0d1dc8b diff --git a/pom.xml b/pom.xml index f4978d999..c03ffde3e 100644 --- a/pom.xml +++ b/pom.xml @@ -100,36 +100,36 @@ - - - forgerock-staging-repository - ForgeRock Release Repository - http://maven.forgerock.org/repo/releases - - false - - - - - forgerock-snapshots-repository - ForgeRock Snapshot Repository - http://maven.forgerock.org/repo/snapshots - - false - - - - - jvnet-nexus-snapshots - https://maven.java.net/content/repositories/snapshots - - false - - - true - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + forgerock-parent From fa83dab8d718eec62e402a16af1e17f4aaed0166 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 11 Oct 2017 15:21:01 +0300 Subject: [PATCH 113/125] 1.0.3 @Override public Promise thenAsync(AsyncFunction onResult, AsyncFunction onException, AsyncFunction onRuntimeException) { --- README.md | 44 +++---------------- forgerock-parent | 2 +- .../opendj/ldap/spi/LdapPromiseWrapper.java | 30 +++++++++++++ pom.xml | 2 +- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index c22d5c096..5bf246248 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ information: "Portions copyright [year] [name of copyright owner]". Copyright 2016 ForgeRock AS. + Portions copyright 2017 3A Systems, LLC --> OpenDJ SDK @@ -20,15 +21,17 @@ OpenDJ SDK ## How-to build -* git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git -* mvn clean install -f OpenDJ-SDK +```bash +git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git +mvn clean install -f OpenDJ-SDK +``` About ========== The **OpenDJ LDAP SDK** provides a set of modern, developer-friendly Java APIs as part of the -[OpenDJ](http://opendj.forgerock.org) product suite, which is actively maintained and supported by -[ForgeRock](http://www.forgerock.com). The product suite includes the client SDK alongside command-line tools and +[OpenDJ](https://github.com/OpenIdentityPlatform/OpenDJ) product suite. +The product suite includes the client SDK alongside command-line tools and sample code, a 100% pure Java directory server, and more. You can use **OpenDJ SDK** to create client applications for use with any server that complies with the [RFC 4510: LDAP - Technical Specification Road Map](http://tools.ietf.org/html/rfc4510). @@ -53,29 +56,6 @@ methods: Maven ----- -By far the simplest method is to develop your application using Maven and add the following settings to your pom.xml: - -```xml - - - forgerock-staging-repository - ForgeRock Release Repository - http://maven.forgerock.org/repo/releases - - false - - - - forgerock-snapshots-repository - ForgeRock Snapshot Repository - http://maven.forgerock.org/repo/snapshots - - false - - - -``` - The following dependencies will load both the [OpenDJ Core APIs](opendj-core) and the [OpenDJ Grizzly](opendj-grizzly) network transport. Remember to override the version according to your needs: @@ -107,16 +87,6 @@ required, in which case you can simply declare a dependency on the OpenDJ core A ``` -Build it yourself ------------------ - -You need `git` and `maven` in order to get the source code and build it: - -```bash -git clone ssh://git@stash.forgerock.org:7999/opendj/opendj-sdk.git -cd opendj-sdk -mvn clean install -``` Getting started =============== diff --git a/forgerock-parent b/forgerock-parent index cf79e17ab..10f643bf2 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit cf79e17ab3d9746688cc0f7406125d69e0d1dc8b +Subproject commit 10f643bf25072a5d77833aa7536f09581ef7cacd diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java index 43eaead13..575b567cf 100644 --- a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java +++ b/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java @@ -167,6 +167,13 @@ public Promise thenAsync( return wrappedPromise.thenAsync(onResult, onException); } + @Override + public Promise thenAsync(AsyncFunction onResult, + AsyncFunction onException, + AsyncFunction onRuntimeException) { + return wrappedPromise.thenAsync(onResult, onException); + } + @Override // @Checkstyle:ignore public Promise thenCatch(Function onException) { @@ -190,4 +197,27 @@ public P getWrappedPromise() { return wrappedPromise; } + @Override + public Promise thenCatchRuntimeException( + Function onRuntimeException) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Promise thenCatchRuntimeExceptionAsync( + AsyncFunction onRuntimeException) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Promise then(Function onResult, + Function onException, + Function onRuntimeException) { + // TODO Auto-generated method stub + return null; + } + + } diff --git a/pom.xml b/pom.xml index c03ffde3e..f47277028 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs - 1.0.2 + 1.0.3 3.1.0 2.3.23 3.1.2 From b46fcf4d70131ac9ce6ed47b66c7f86b808d03ff Mon Sep 17 00:00:00 2001 From: vharseko Date: Sun, 15 Oct 2017 21:46:16 +0300 Subject: [PATCH 114/125] update submodules --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 10f643bf2..4c2fbfd72 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 10f643bf25072a5d77833aa7536f09581ef7cacd +Subproject commit 4c2fbfd72f9f081785ea8af08863aef090956507 From b1212f3d547d7d9a4fb5c3b4a0a0b111a61d6113 Mon Sep 17 00:00:00 2001 From: vharseko Date: Tue, 17 Oct 2017 00:03:18 +0300 Subject: [PATCH 115/125] update forgerock-parent --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 4c2fbfd72..57fb1488e 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 4c2fbfd72f9f081785ea8af08863aef090956507 +Subproject commit 57fb1488e22503cb0388f6fa9ba6a421bc9788e4 From 87daf705ccbf64bd9c46a8cec65c380b1ec46c64 Mon Sep 17 00:00:00 2001 From: vharseko Date: Tue, 17 Oct 2017 00:11:05 +0300 Subject: [PATCH 116/125] update forgerock-parent --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 57fb1488e..3f8788491 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 57fb1488e22503cb0388f6fa9ba6a421bc9788e4 +Subproject commit 3f8788491a311667503b53b12e9cc2f4fca5559a From 547e7bf16f4d5135369c1b73590d42dca9e2ce4d Mon Sep 17 00:00:00 2001 From: vharseko Date: Tue, 17 Oct 2017 09:45:21 +0300 Subject: [PATCH 117/125] fix travis --- .travis.yml | 4 +++- README.md | 1 + pom.xml | 1 - 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c2b507049..df2ef0cca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,5 +20,7 @@ notifications: cache: directories: - $HOME/.m2 +before_install: + - mvn -q -DskipTests install -f forgerock-parent script: - - mvn -q clean install + - mvn -q install diff --git a/README.md b/README.md index 5bf246248..467bdcb2c 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ OpenDJ SDK ```bash git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git +mvn clean install -f forgerock-parent mvn clean install -f OpenDJ-SDK ``` diff --git a/pom.xml b/pom.xml index f47277028..cc4cc5a66 100644 --- a/pom.xml +++ b/pom.xml @@ -132,7 +132,6 @@ - forgerock-parent opendj-sdk-bom opendj-doc-maven-plugin opendj-core From 46ac0c640b29bcbbfb6dbbafeeb7131bdef08e98 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 18 Oct 2017 19:02:47 +0300 Subject: [PATCH 118/125] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 467bdcb2c..e1bfc25c7 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ OpenDJ SDK ```bash git clone --recursive https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git -mvn clean install -f forgerock-parent +mvn clean install -f OpenDJ-SDK/forgerock-parent mvn clean install -f OpenDJ-SDK ``` From 625d3c4dd3b6dfca404502463632bc0633d9bb19 Mon Sep 17 00:00:00 2001 From: vharseko Date: Wed, 18 Oct 2017 19:04:19 +0300 Subject: [PATCH 119/125] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e1bfc25c7..447894c37 100644 --- a/README.md +++ b/README.md @@ -65,12 +65,12 @@ network transport. Remember to override the version according to your needs: org.forgerock.opendj opendj-core - 3.0.0 + 4.0.0-SNAPSHOT org.forgerock.opendj opendj-grizzly - 3.0.0 + 4.0.0-SNAPSHOT ``` @@ -83,7 +83,7 @@ required, in which case you can simply declare a dependency on the OpenDJ core A org.forgerock.opendj opendj-core - 3.0.0 + 4.0.0-SNAPSHOT ``` From acabe48767a60a2157518b9717391a113a5e8152 Mon Sep 17 00:00:00 2001 From: vharseko Date: Thu, 19 Oct 2017 10:20:22 +0300 Subject: [PATCH 120/125] Update .travis.yml --- .travis.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index df2ef0cca..b35ae086f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,20 +7,18 @@ matrix: jdk: openjdk8 - os: osx osx_image: xcode9.1 -before_install: - - date -u - - uname -a - - env | sort + allow_failures: + - os: osx branches: only: - master notifications: email: - support@openam.org.ru -cache: - directories: - - $HOME/.m2 before_install: - - mvn -q -DskipTests install -f forgerock-parent + - date -u + - uname -a + - env | sort + - mvn -q -DskipTests install -f forgerock-parent script: - - mvn -q install + - mvn -q install From a7cee6214da7efa77bdb5c8b992303b8b8f6bde6 Mon Sep 17 00:00:00 2001 From: vharseko Date: Fri, 10 Nov 2017 16:03:20 +0300 Subject: [PATCH 121/125] - --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 3f8788491..9963af666 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 3f8788491a311667503b53b12e9cc2f4fca5559a +Subproject commit 9963af6663bd51bf5d359784b264ac81715bcc8a From 32b37817f36f45d65b4262f69993c40497ed5a93 Mon Sep 17 00:00:00 2001 From: vharseko Date: Fri, 10 Nov 2017 17:09:01 +0300 Subject: [PATCH 122/125] update submodules --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 9963af666..330fe28b6 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 9963af6663bd51bf5d359784b264ac81715bcc8a +Subproject commit 330fe28b6f5acd80f839888061035483bda8e36f From 19f17be6b5c15bfb892828d52bf24a826735feff Mon Sep 17 00:00:00 2001 From: vharseko Date: Fri, 10 Nov 2017 17:15:24 +0300 Subject: [PATCH 123/125] update submodules --- forgerock-parent | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forgerock-parent b/forgerock-parent index 330fe28b6..8a3e71f63 160000 --- a/forgerock-parent +++ b/forgerock-parent @@ -1 +1 @@ -Subproject commit 330fe28b6f5acd80f839888061035483bda8e36f +Subproject commit 8a3e71f63ab5232c0334b717fd206432fbd1d200 From 0b67f9a0b50d2e1395792620cae3dd5e9282548c Mon Sep 17 00:00:00 2001 From: vharseko Date: Mon, 20 Nov 2017 12:54:35 +0300 Subject: [PATCH 124/125] resolve dependency conflict names wirh opendj server --- README.md | 12 ++++++------ opendj-cli/pom.xml | 4 ++-- opendj-doc-maven-plugin/pom.xml | 2 +- opendj-ldap-sdk-examples/pom.xml | 4 ++-- opendj-ldap-toolkit/pom.xml | 6 +++--- opendj-rest2ldap/pom.xml | 2 +- opendj-sdk-bom/pom.xml | 4 ++-- .../clirr-ignored-api-changes.xml | 0 {opendj-core => opendj-sdk-core}/pom.xml | 4 ++-- .../controls/AccountUsabilityRequestControl.java | 0 .../controls/AccountUsabilityResponseControl.java | 0 .../controls/RealAttributesOnlyRequestControl.java | 0 .../opendj/ldap/controls/TransactionIdControl.java | 0 .../VirtualAttributesOnlyRequestControl.java | 0 .../forgerock/opendj/ldap/controls/package-info.java | 0 .../extensions/GetConnectionIDExtendedRequest.java | 0 .../extensions/GetConnectionIDExtendedResult.java | 0 .../extensions/GetSymmetricKeyExtendedRequest.java | 0 .../PasswordPolicyStateExtendedRequest.java | 0 .../PasswordPolicyStateExtendedResult.java | 0 .../extensions/PasswordPolicyStateOperation.java | 0 .../PasswordPolicyStateOperationContainer.java | 0 .../extensions/PasswordPolicyStateOperationType.java | 0 .../opendj/ldap/extensions/package-info.java | 0 .../com/forgerock/opendj/util/ASCIICharProp.java | 0 .../java/com/forgerock/opendj/util/Collections2.java | 0 .../java/com/forgerock/opendj/util/Iterables.java | 0 .../java/com/forgerock/opendj/util/Iterators.java | 0 .../com/forgerock/opendj/util/OperatingSystem.java | 0 .../java/com/forgerock/opendj/util/PackedLong.java | 0 .../java/com/forgerock/opendj/util/Predicate.java | 0 .../opendj/util/ReferenceCountedObject.java | 0 .../forgerock/opendj/util/SizeLimitInputStream.java | 0 .../java/com/forgerock/opendj/util/StaticUtils.java | 0 .../com/forgerock/opendj/util/StringPrepProfile.java | 0 .../com/forgerock/opendj/util/SubstringReader.java | 0 .../java/com/forgerock/opendj/util/package-info.java | 0 .../src/main/java/org/forgerock/opendj/io/ASN1.java | 0 .../forgerock/opendj/io/ASN1ByteSequenceReader.java | 0 .../forgerock/opendj/io/ASN1InputStreamReader.java | 0 .../forgerock/opendj/io/ASN1OutputStreamWriter.java | 0 .../java/org/forgerock/opendj/io/ASN1Reader.java | 0 .../java/org/forgerock/opendj/io/ASN1Writer.java | 0 .../org/forgerock/opendj/io/AbstractASN1Reader.java | 0 .../org/forgerock/opendj/io/AbstractASN1Writer.java | 0 .../opendj/io/AbstractLDAPMessageHandler.java | 0 .../src/main/java/org/forgerock/opendj/io/LDAP.java | 0 .../org/forgerock/opendj/io/LDAPMessageHandler.java | 0 .../java/org/forgerock/opendj/io/LDAPReader.java | 0 .../java/org/forgerock/opendj/io/LDAPWriter.java | 0 .../java/org/forgerock/opendj/io/package-info.java | 0 .../src/main/java/org/forgerock/opendj/ldap/AVA.java | 0 .../opendj/ldap/AbstractAsynchronousConnection.java | 0 .../org/forgerock/opendj/ldap/AbstractAttribute.java | 0 .../forgerock/opendj/ldap/AbstractConnection.java | 0 .../opendj/ldap/AbstractConnectionWrapper.java | 0 .../org/forgerock/opendj/ldap/AbstractEntry.java | 0 .../forgerock/opendj/ldap/AbstractFilterVisitor.java | 0 .../org/forgerock/opendj/ldap/AbstractMapEntry.java | 0 .../opendj/ldap/AbstractSynchronousConnection.java | 0 .../java/org/forgerock/opendj/ldap/AddressMask.java | 0 .../java/org/forgerock/opendj/ldap/Assertion.java | 0 .../opendj/ldap/AssertionFailureException.java | 0 .../java/org/forgerock/opendj/ldap/Attribute.java | 0 .../forgerock/opendj/ldap/AttributeDescription.java | 0 .../org/forgerock/opendj/ldap/AttributeFactory.java | 0 .../org/forgerock/opendj/ldap/AttributeFilter.java | 0 .../org/forgerock/opendj/ldap/AttributeParser.java | 0 .../java/org/forgerock/opendj/ldap/Attributes.java | 0 .../opendj/ldap/AuthenticationException.java | 0 .../opendj/ldap/AuthorizationException.java | 0 .../main/java/org/forgerock/opendj/ldap/Base64.java | 0 .../java/org/forgerock/opendj/ldap/ByteSequence.java | 0 .../forgerock/opendj/ldap/ByteSequenceReader.java | 0 .../java/org/forgerock/opendj/ldap/ByteString.java | 0 .../org/forgerock/opendj/ldap/ByteStringBuilder.java | 0 .../forgerock/opendj/ldap/CachedConnectionPool.java | 0 .../forgerock/opendj/ldap/CancelRequestListener.java | 0 .../opendj/ldap/CancelledResultException.java | 0 .../org/forgerock/opendj/ldap/CommonLDAPOptions.java | 0 .../org/forgerock/opendj/ldap/ConditionResult.java | 0 .../java/org/forgerock/opendj/ldap/Connection.java | 0 .../opendj/ldap/ConnectionEventListener.java | 0 .../forgerock/opendj/ldap/ConnectionException.java | 0 .../org/forgerock/opendj/ldap/ConnectionFactory.java | 0 .../opendj/ldap/ConnectionLoadBalancer.java | 0 .../org/forgerock/opendj/ldap/ConnectionPool.java | 0 .../opendj/ldap/ConnectionSecurityLayer.java | 0 .../java/org/forgerock/opendj/ldap/Connections.java | 0 .../opendj/ldap/ConstraintViolationException.java | 0 .../src/main/java/org/forgerock/opendj/ldap/DN.java | 0 .../org/forgerock/opendj/ldap/DecodeException.java | 0 .../org/forgerock/opendj/ldap/DecodeOptions.java | 0 .../opendj/ldap/DereferenceAliasesPolicy.java | 0 .../main/java/org/forgerock/opendj/ldap/Entries.java | 0 .../main/java/org/forgerock/opendj/ldap/Entry.java | 0 .../java/org/forgerock/opendj/ldap/EntryFactory.java | 0 .../opendj/ldap/EntryNotFoundException.java | 0 .../main/java/org/forgerock/opendj/ldap/Filter.java | 0 .../org/forgerock/opendj/ldap/FilterVisitor.java | 0 .../java/org/forgerock/opendj/ldap/Functions.java | 0 .../java/org/forgerock/opendj/ldap/GSERParser.java | 0 .../org/forgerock/opendj/ldap/GeneralizedTime.java | 0 .../opendj/ldap/IntermediateResponseHandler.java | 0 .../forgerock/opendj/ldap/InternalConnection.java | 0 .../opendj/ldap/InternalConnectionFactory.java | 0 .../java/org/forgerock/opendj/ldap/KeyManagers.java | 0 .../org/forgerock/opendj/ldap/LDAPClientContext.java | 0 .../forgerock/opendj/ldap/LDAPConnectionFactory.java | 0 .../java/org/forgerock/opendj/ldap/LDAPListener.java | 0 .../main/java/org/forgerock/opendj/ldap/LDAPUrl.java | 0 .../org/forgerock/opendj/ldap/LdapException.java | 0 .../java/org/forgerock/opendj/ldap/LdapPromise.java | 0 .../org/forgerock/opendj/ldap/LdapResultHandler.java | 0 .../org/forgerock/opendj/ldap/LinkedAttribute.java | 0 .../forgerock/opendj/ldap/LinkedHashMapEntry.java | 0 .../java/org/forgerock/opendj/ldap/LoadBalancer.java | 0 .../opendj/ldap/LoadBalancerEventListener.java | 0 .../main/java/org/forgerock/opendj/ldap/Matcher.java | 0 .../org/forgerock/opendj/ldap/MemoryBackend.java | 0 .../java/org/forgerock/opendj/ldap/Modification.java | 0 .../org/forgerock/opendj/ldap/ModificationType.java | 0 .../opendj/ldap/MultipleEntriesFoundException.java | 0 .../opendj/ldap/ProviderNotFoundException.java | 0 .../src/main/java/org/forgerock/opendj/ldap/RDN.java | 0 .../org/forgerock/opendj/ldap/ReferralException.java | 0 .../org/forgerock/opendj/ldap/RequestContext.java | 0 .../org/forgerock/opendj/ldap/RequestHandler.java | 0 .../forgerock/opendj/ldap/RequestHandlerFactory.java | 0 .../opendj/ldap/RequestHandlerFactoryAdapter.java | 0 .../forgerock/opendj/ldap/RequestLoadBalancer.java | 0 .../java/org/forgerock/opendj/ldap/ResultCode.java | 0 .../main/java/org/forgerock/opendj/ldap/RootDSE.java | 0 .../org/forgerock/opendj/ldap/SSLContextBuilder.java | 0 .../org/forgerock/opendj/ldap/SchemaResolver.java | 0 .../forgerock/opendj/ldap/SearchResultHandler.java | 0 .../ldap/SearchResultReferenceIOException.java | 0 .../java/org/forgerock/opendj/ldap/SearchScope.java | 0 .../org/forgerock/opendj/ldap/ServerConnection.java | 0 .../opendj/ldap/ServerConnectionFactory.java | 0 .../main/java/org/forgerock/opendj/ldap/SortKey.java | 0 .../org/forgerock/opendj/ldap/TimeoutChecker.java | 0 .../forgerock/opendj/ldap/TimeoutEventListener.java | 0 .../opendj/ldap/TimeoutResultException.java | 0 .../java/org/forgerock/opendj/ldap/TreeMapEntry.java | 0 .../org/forgerock/opendj/ldap/TrustManagers.java | 0 .../ldap/controls/ADNotificationRequestControl.java | 0 .../ldap/controls/AssertionRequestControl.java | 0 .../AuthorizationIdentityRequestControl.java | 0 .../AuthorizationIdentityResponseControl.java | 0 .../org/forgerock/opendj/ldap/controls/Control.java | 0 .../opendj/ldap/controls/ControlDecoder.java | 0 .../EntryChangeNotificationResponseControl.java | 0 .../opendj/ldap/controls/GenericControl.java | 0 .../controls/GetEffectiveRightsRequestControl.java | 0 .../ldap/controls/ManageDsaITRequestControl.java | 0 .../ldap/controls/MatchedValuesRequestControl.java | 0 .../controls/PasswordExpiredResponseControl.java | 0 .../controls/PasswordExpiringResponseControl.java | 0 .../ldap/controls/PasswordPolicyErrorType.java | 0 .../ldap/controls/PasswordPolicyRequestControl.java | 0 .../ldap/controls/PasswordPolicyResponseControl.java | 0 .../ldap/controls/PasswordPolicyWarningType.java | 0 .../controls/PermissiveModifyRequestControl.java | 0 .../ldap/controls/PersistentSearchChangeType.java | 0 .../controls/PersistentSearchRequestControl.java | 0 .../opendj/ldap/controls/PostReadRequestControl.java | 0 .../ldap/controls/PostReadResponseControl.java | 0 .../opendj/ldap/controls/PreReadRequestControl.java | 0 .../opendj/ldap/controls/PreReadResponseControl.java | 0 .../ldap/controls/ProxiedAuthV1RequestControl.java | 0 .../ldap/controls/ProxiedAuthV2RequestControl.java | 0 .../ldap/controls/ServerSideSortRequestControl.java | 0 .../ldap/controls/ServerSideSortResponseControl.java | 0 .../ldap/controls/SimplePagedResultsControl.java | 0 .../ldap/controls/SubentriesRequestControl.java | 0 .../ldap/controls/SubtreeDeleteRequestControl.java | 0 .../ldap/controls/VirtualListViewRequestControl.java | 0 .../controls/VirtualListViewResponseControl.java | 0 .../forgerock/opendj/ldap/controls/package-info.java | 0 .../java/org/forgerock/opendj/ldap/package-info.java | 0 .../opendj/ldap/requests/AbandonRequest.java | 0 .../opendj/ldap/requests/AbandonRequestImpl.java | 0 .../opendj/ldap/requests/AbstractBindRequest.java | 0 .../ldap/requests/AbstractExtendedRequest.java | 0 .../opendj/ldap/requests/AbstractRequestImpl.java | 0 .../ldap/requests/AbstractSASLBindRequest.java | 0 .../requests/AbstractUnmodifiableBindRequest.java | 0 .../AbstractUnmodifiableExtendedRequest.java | 0 .../ldap/requests/AbstractUnmodifiableRequest.java | 0 .../AbstractUnmodifiableSASLBindRequest.java | 0 .../forgerock/opendj/ldap/requests/AddRequest.java | 0 .../opendj/ldap/requests/AddRequestImpl.java | 0 .../ldap/requests/AnonymousSASLBindRequest.java | 0 .../ldap/requests/AnonymousSASLBindRequestImpl.java | 0 .../forgerock/opendj/ldap/requests/BindClient.java | 0 .../opendj/ldap/requests/BindClientImpl.java | 0 .../forgerock/opendj/ldap/requests/BindRequest.java | 0 .../opendj/ldap/requests/CRAMMD5SASLBindRequest.java | 0 .../ldap/requests/CRAMMD5SASLBindRequestImpl.java | 0 .../opendj/ldap/requests/CancelExtendedRequest.java | 0 .../ldap/requests/CancelExtendedRequestImpl.java | 0 .../opendj/ldap/requests/CompareRequest.java | 0 .../opendj/ldap/requests/CompareRequestImpl.java | 0 .../opendj/ldap/requests/DeleteRequest.java | 0 .../opendj/ldap/requests/DeleteRequestImpl.java | 0 .../ldap/requests/DigestMD5SASLBindRequest.java | 0 .../ldap/requests/DigestMD5SASLBindRequestImpl.java | 0 .../opendj/ldap/requests/ExtendedRequest.java | 0 .../opendj/ldap/requests/ExtendedRequestDecoder.java | 0 .../ldap/requests/ExternalSASLBindRequest.java | 0 .../ldap/requests/ExternalSASLBindRequestImpl.java | 0 .../opendj/ldap/requests/GSSAPISASLBindRequest.java | 0 .../ldap/requests/GSSAPISASLBindRequestImpl.java | 0 .../opendj/ldap/requests/GenericBindRequest.java | 0 .../opendj/ldap/requests/GenericBindRequestImpl.java | 0 .../opendj/ldap/requests/GenericExtendedRequest.java | 0 .../ldap/requests/GenericExtendedRequestImpl.java | 0 .../opendj/ldap/requests/ModifyDNRequest.java | 0 .../opendj/ldap/requests/ModifyDNRequestImpl.java | 0 .../opendj/ldap/requests/ModifyRequest.java | 0 .../opendj/ldap/requests/ModifyRequestImpl.java | 0 .../ldap/requests/PasswordModifyExtendedRequest.java | 0 .../requests/PasswordModifyExtendedRequestImpl.java | 0 .../opendj/ldap/requests/PlainSASLBindRequest.java | 0 .../ldap/requests/PlainSASLBindRequestImpl.java | 0 .../org/forgerock/opendj/ldap/requests/Request.java | 0 .../org/forgerock/opendj/ldap/requests/Requests.java | 0 .../opendj/ldap/requests/SASLBindClientImpl.java | 0 .../opendj/ldap/requests/SASLBindRequest.java | 0 .../opendj/ldap/requests/SearchRequest.java | 0 .../opendj/ldap/requests/SearchRequestImpl.java | 0 .../opendj/ldap/requests/SimpleBindRequest.java | 0 .../opendj/ldap/requests/SimpleBindRequestImpl.java | 0 .../ldap/requests/StartTLSExtendedRequest.java | 0 .../ldap/requests/StartTLSExtendedRequestImpl.java | 0 .../opendj/ldap/requests/UnbindRequest.java | 0 .../opendj/ldap/requests/UnbindRequestImpl.java | 0 .../requests/UnmodifiableAbandonRequestImpl.java | 0 .../ldap/requests/UnmodifiableAddRequestImpl.java | 0 .../UnmodifiableAnonymousSASLBindRequestImpl.java | 0 .../UnmodifiableCRAMMD5SASLBindRequestImpl.java | 0 .../UnmodifiableCancelExtendedRequestImpl.java | 0 .../requests/UnmodifiableCompareRequestImpl.java | 0 .../ldap/requests/UnmodifiableDeleteRequestImpl.java | 0 .../UnmodifiableDigestMD5SASLBindRequestImpl.java | 0 .../UnmodifiableExternalSASLBindRequestImpl.java | 0 .../UnmodifiableGSSAPISASLBindRequestImpl.java | 0 .../requests/UnmodifiableGenericBindRequestImpl.java | 0 .../UnmodifiableGenericExtendedRequestImpl.java | 0 .../requests/UnmodifiableModifyDNRequestImpl.java | 0 .../ldap/requests/UnmodifiableModifyRequestImpl.java | 0 ...nmodifiablePasswordModifyExtendedRequestImpl.java | 0 .../UnmodifiablePlainSASLBindRequestImpl.java | 0 .../ldap/requests/UnmodifiableSearchRequestImpl.java | 0 .../requests/UnmodifiableSimpleBindRequestImpl.java | 0 .../UnmodifiableStartTLSExtendedRequestImpl.java | 0 .../ldap/requests/UnmodifiableUnbindRequestImpl.java | 0 .../UnmodifiableWhoAmIExtendedRequestImpl.java | 0 .../opendj/ldap/requests/WhoAmIExtendedRequest.java | 0 .../ldap/requests/WhoAmIExtendedRequestImpl.java | 0 .../forgerock/opendj/ldap/requests/package-info.java | 0 .../ldap/responses/AbstractExtendedResult.java | 0 .../responses/AbstractExtendedResultDecoder.java | 0 .../ldap/responses/AbstractIntermediateResponse.java | 0 .../opendj/ldap/responses/AbstractResponseImpl.java | 0 .../opendj/ldap/responses/AbstractResultImpl.java | 0 .../AbstractUnmodifiableExtendedResultImpl.java | 0 ...AbstractUnmodifiableIntermediateResponseImpl.java | 0 .../responses/AbstractUnmodifiableResponseImpl.java | 0 .../responses/AbstractUnmodifiableResultImpl.java | 0 .../forgerock/opendj/ldap/responses/BindResult.java | 0 .../opendj/ldap/responses/BindResultImpl.java | 0 .../opendj/ldap/responses/CompareResult.java | 0 .../opendj/ldap/responses/CompareResultImpl.java | 0 .../opendj/ldap/responses/ExtendedResult.java | 0 .../opendj/ldap/responses/ExtendedResultDecoder.java | 0 .../opendj/ldap/responses/GenericExtendedResult.java | 0 .../ldap/responses/GenericExtendedResultImpl.java | 0 .../ldap/responses/GenericIntermediateResponse.java | 0 .../responses/GenericIntermediateResponseImpl.java | 0 .../opendj/ldap/responses/IntermediateResponse.java | 0 .../ldap/responses/PasswordModifyExtendedResult.java | 0 .../responses/PasswordModifyExtendedResultImpl.java | 0 .../forgerock/opendj/ldap/responses/Response.java | 0 .../forgerock/opendj/ldap/responses/Responses.java | 0 .../org/forgerock/opendj/ldap/responses/Result.java | 0 .../forgerock/opendj/ldap/responses/ResultImpl.java | 0 .../opendj/ldap/responses/SearchResultEntry.java | 0 .../opendj/ldap/responses/SearchResultEntryImpl.java | 0 .../opendj/ldap/responses/SearchResultReference.java | 0 .../ldap/responses/SearchResultReferenceImpl.java | 0 .../ldap/responses/UnmodifiableBindResultImpl.java | 0 .../responses/UnmodifiableCompareResultImpl.java | 0 .../UnmodifiableGenericExtendedResultImpl.java | 0 .../UnmodifiableGenericIntermediateResponseImpl.java | 0 ...UnmodifiablePasswordModifyExtendedResultImpl.java | 0 .../ldap/responses/UnmodifiableResultImpl.java | 0 .../responses/UnmodifiableSearchResultEntryImpl.java | 0 .../UnmodifiableSearchResultReferenceImpl.java | 0 .../UnmodifiableWhoAmIExtendedResultImpl.java | 0 .../opendj/ldap/responses/WhoAmIExtendedResult.java | 0 .../ldap/responses/WhoAmIExtendedResultImpl.java | 0 .../opendj/ldap/responses/package-info.java | 0 .../schema/AbstractApproximateMatchingRuleImpl.java | 0 .../schema/AbstractEqualityMatchingRuleImpl.java | 0 .../opendj/ldap/schema/AbstractMatchingRuleImpl.java | 0 .../schema/AbstractOrderingMatchingRuleImpl.java | 0 .../schema/AbstractSubstringMatchingRuleImpl.java | 0 .../opendj/ldap/schema/AbstractSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/AttributeType.java | 0 .../opendj/ldap/schema/AttributeTypeSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/AttributeUsage.java | 0 .../AuthPasswordExactEqualityMatchingRuleImpl.java | 0 .../opendj/ldap/schema/AuthPasswordSyntaxImpl.java | 0 .../opendj/ldap/schema/BinarySyntaxImpl.java | 0 .../schema/BitStringEqualityMatchingRuleImpl.java | 0 .../opendj/ldap/schema/BitStringSyntaxImpl.java | 0 .../ldap/schema/BooleanEqualityMatchingRuleImpl.java | 0 .../opendj/ldap/schema/BooleanSyntaxImpl.java | 0 .../schema/CaseExactEqualityMatchingRuleImpl.java | 0 .../schema/CaseExactIA5EqualityMatchingRuleImpl.java | 0 .../CaseExactIA5SubstringMatchingRuleImpl.java | 0 .../schema/CaseExactOrderingMatchingRuleImpl.java | 0 .../schema/CaseExactSubstringMatchingRuleImpl.java | 0 .../schema/CaseIgnoreEqualityMatchingRuleImpl.java | 0 .../CaseIgnoreIA5EqualityMatchingRuleImpl.java | 0 .../CaseIgnoreIA5SubstringMatchingRuleImpl.java | 0 .../CaseIgnoreListEqualityMatchingRuleImpl.java | 0 .../CaseIgnoreListSubstringMatchingRuleImpl.java | 0 .../schema/CaseIgnoreOrderingMatchingRuleImpl.java | 0 .../schema/CaseIgnoreSubstringMatchingRuleImpl.java | 0 .../schema/CertificateExactAssertionSyntaxImpl.java | 0 .../schema/CertificateExactMatchingRuleImpl.java | 0 .../ldap/schema/CertificateListSyntaxImpl.java | 0 .../ldap/schema/CertificatePairSyntaxImpl.java | 0 .../opendj/ldap/schema/CertificateSyntaxImpl.java | 0 .../ldap/schema/CollationMatchingRulesImpl.java | 0 .../schema/ConflictingSchemaElementException.java | 0 .../org/forgerock/opendj/ldap/schema/CoreSchema.java | 0 .../forgerock/opendj/ldap/schema/CoreSchemaImpl.java | 0 .../ldap/schema/CoreSchemaSupportedLocales.java | 0 .../opendj/ldap/schema/CountryStringSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/DITContentRule.java | 0 .../opendj/ldap/schema/DITContentRuleSyntaxImpl.java | 0 .../opendj/ldap/schema/DITStructureRule.java | 0 .../ldap/schema/DITStructureRuleSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/DelayedSchema.java | 0 .../opendj/ldap/schema/DeliveryMethodSyntaxImpl.java | 0 ...StringFirstComponentEqualityMatchingRuleImpl.java | 0 .../ldap/schema/DirectoryStringSyntaxImpl.java | 0 .../DistinguishedNameEqualityMatchingRuleImpl.java | 0 .../ldap/schema/DistinguishedNameSyntaxImpl.java | 0 .../DoubleMetaphoneApproximateMatchingRuleImpl.java | 0 .../opendj/ldap/schema/EnhancedGuideSyntaxImpl.java | 0 .../opendj/ldap/schema/EnumOrderingMatchingRule.java | 0 .../forgerock/opendj/ldap/schema/EnumSyntaxImpl.java | 0 .../ldap/schema/FacsimileNumberSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/FaxSyntaxImpl.java | 0 .../GeneralizedTimeEqualityMatchingRuleImpl.java | 0 .../GeneralizedTimeOrderingMatchingRuleImpl.java | 0 .../ldap/schema/GeneralizedTimeSyntaxImpl.java | 0 .../opendj/ldap/schema/GenerateCoreSchema.java | 0 .../opendj/ldap/schema/GuideSyntaxImpl.java | 0 .../opendj/ldap/schema/IA5StringSyntaxImpl.java | 0 .../ldap/schema/IntegerEqualityMatchingRuleImpl.java | 0 ...ntegerFirstComponentEqualityMatchingRuleImpl.java | 0 .../ldap/schema/IntegerOrderingMatchingRuleImpl.java | 0 .../opendj/ldap/schema/IntegerSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java | 0 .../ldap/schema/KeywordEqualityMatchingRuleImpl.java | 0 .../ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/MatchingRule.java | 0 .../opendj/ldap/schema/MatchingRuleImpl.java | 0 .../opendj/ldap/schema/MatchingRuleSyntaxImpl.java | 0 .../opendj/ldap/schema/MatchingRuleUse.java | 0 .../ldap/schema/MatchingRuleUseSyntaxImpl.java | 0 .../ldap/schema/NameAndOptionalUIDSyntaxImpl.java | 0 .../org/forgerock/opendj/ldap/schema/NameForm.java | 0 .../opendj/ldap/schema/NameFormSyntaxImpl.java | 0 .../NumericStringEqualityMatchingRuleImpl.java | 0 .../NumericStringOrderingMatchingRuleImpl.java | 0 .../NumericStringSubstringMatchingRuleImpl.java | 0 .../opendj/ldap/schema/NumericStringSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/OIDSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/ObjectClass.java | 0 .../opendj/ldap/schema/ObjectClassSyntaxImpl.java | 0 .../opendj/ldap/schema/ObjectClassType.java | 0 .../ObjectIdentifierEqualityMatchingRuleImpl.java | 0 ...tifierFirstComponentEqualityMatchingRuleImpl.java | 0 .../schema/OctetStringEqualityMatchingRuleImpl.java | 0 .../schema/OctetStringOrderingMatchingRuleImpl.java | 0 .../schema/OctetStringSubstringMatchingRuleImpl.java | 0 .../opendj/ldap/schema/OctetStringSyntaxImpl.java | 0 .../opendj/ldap/schema/OtherMailboxSyntaxImpl.java | 0 .../opendj/ldap/schema/PostalAddressSyntaxImpl.java | 0 .../PresentationAddressEqualityMatchingRuleImpl.java | 0 .../ldap/schema/PresentationAddressSyntaxImpl.java | 0 .../ldap/schema/PrintableStringSyntaxImpl.java | 0 .../ProtocolInformationEqualityMatchingRuleImpl.java | 0 .../ldap/schema/ProtocolInformationSyntaxImpl.java | 0 .../opendj/ldap/schema/RegexSyntaxImpl.java | 0 .../org/forgerock/opendj/ldap/schema/Schema.java | 0 .../forgerock/opendj/ldap/schema/SchemaBuilder.java | 0 .../opendj/ldap/schema/SchemaConstants.java | 0 .../forgerock/opendj/ldap/schema/SchemaElement.java | 0 .../opendj/ldap/schema/SchemaException.java | 0 .../forgerock/opendj/ldap/schema/SchemaOptions.java | 0 .../forgerock/opendj/ldap/schema/SchemaUtils.java | 0 .../opendj/ldap/schema/SchemaValidationPolicy.java | 0 .../ldap/schema/SubstringAssertionSyntaxImpl.java | 0 .../ldap/schema/SupportedAlgorithmSyntaxImpl.java | 0 .../org/forgerock/opendj/ldap/schema/Syntax.java | 0 .../org/forgerock/opendj/ldap/schema/SyntaxImpl.java | 0 .../TelephoneNumberEqualityMatchingRuleImpl.java | 0 .../TelephoneNumberSubstringMatchingRuleImpl.java | 0 .../ldap/schema/TelephoneNumberSyntaxImpl.java | 0 .../schema/TeletexTerminalIdentifierSyntaxImpl.java | 0 .../opendj/ldap/schema/TelexNumberSyntaxImpl.java | 0 .../ldap/schema/TimeBasedMatchingRulesImpl.java | 0 .../opendj/ldap/schema/UTCTimeSyntaxImpl.java | 0 .../ldap/schema/UUIDEqualityMatchingRuleImpl.java | 0 .../ldap/schema/UUIDOrderingMatchingRuleImpl.java | 0 .../forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java | 0 .../schema/UniqueMemberEqualityMatchingRuleImpl.java | 0 .../ldap/schema/UnknownSchemaElementException.java | 0 .../UserPasswordExactEqualityMatchingRuleImpl.java | 0 .../opendj/ldap/schema/UserPasswordSyntaxImpl.java | 0 .../forgerock/opendj/ldap/schema/package-info.java | 0 .../opendj/ldap/spi/BindResultLdapPromiseImpl.java | 0 .../forgerock/opendj/ldap/spi/ConnectionState.java | 0 .../ldap/spi/ExtendedResultLdapPromiseImpl.java | 0 .../forgerock/opendj/ldap/spi/IndexQueryFactory.java | 0 .../java/org/forgerock/opendj/ldap/spi/Indexer.java | 0 .../forgerock/opendj/ldap/spi/IndexingOptions.java | 0 .../opendj/ldap/spi/LDAPConnectionFactoryImpl.java | 0 .../opendj/ldap/spi/LDAPConnectionImpl.java | 0 .../forgerock/opendj/ldap/spi/LDAPListenerImpl.java | 0 .../forgerock/opendj/ldap/spi/LdapPromiseImpl.java | 0 .../opendj/ldap/spi/LdapPromiseWrapper.java | 0 .../org/forgerock/opendj/ldap/spi/LdapPromises.java | 0 .../java/org/forgerock/opendj/ldap/spi/Provider.java | 0 .../opendj/ldap/spi/ResultLdapPromiseImpl.java | 0 .../opendj/ldap/spi/SearchResultLdapPromiseImpl.java | 0 .../forgerock/opendj/ldap/spi/TransportProvider.java | 0 .../org/forgerock/opendj/ldap/spi/package-info.java | 0 .../forgerock/opendj/ldif/AbstractLDIFReader.java | 0 .../forgerock/opendj/ldif/AbstractLDIFStream.java | 0 .../forgerock/opendj/ldif/AbstractLDIFWriter.java | 0 .../java/org/forgerock/opendj/ldif/ChangeRecord.java | 0 .../forgerock/opendj/ldif/ChangeRecordReader.java | 0 .../forgerock/opendj/ldif/ChangeRecordVisitor.java | 0 .../opendj/ldif/ChangeRecordVisitorWriter.java | 0 .../forgerock/opendj/ldif/ChangeRecordWriter.java | 0 .../opendj/ldif/ConnectionChangeRecordWriter.java | 0 .../forgerock/opendj/ldif/ConnectionEntryReader.java | 0 .../forgerock/opendj/ldif/ConnectionEntryWriter.java | 0 .../org/forgerock/opendj/ldif/EntryGenerator.java | 0 .../java/org/forgerock/opendj/ldif/EntryReader.java | 0 .../java/org/forgerock/opendj/ldif/EntryWriter.java | 0 .../main/java/org/forgerock/opendj/ldif/LDIF.java | 0 .../opendj/ldif/LDIFChangeRecordReader.java | 0 .../opendj/ldif/LDIFChangeRecordWriter.java | 0 .../org/forgerock/opendj/ldif/LDIFEntryReader.java | 0 .../org/forgerock/opendj/ldif/LDIFEntryWriter.java | 0 .../opendj/ldif/RejectedChangeRecordListener.java | 0 .../forgerock/opendj/ldif/RejectedLDIFListener.java | 0 .../java/org/forgerock/opendj/ldif/TemplateFile.java | 0 .../java/org/forgerock/opendj/ldif/TemplateTag.java | 0 .../java/org/forgerock/opendj/ldif/package-info.java | 0 .../src/main/javadoc/overview.html | 0 .../com/forgerock/opendj/ldap/core.properties | 0 .../com/forgerock/opendj/ldap/core_de.properties | 0 .../com/forgerock/opendj/ldap/core_es.properties | 0 .../com/forgerock/opendj/ldap/core_fr.properties | 0 .../com/forgerock/opendj/ldap/core_ja.properties | 0 .../com/forgerock/opendj/ldap/core_ko.properties | 0 .../com/forgerock/opendj/ldap/core_zh_CN.properties | 0 .../com/forgerock/opendj/ldap/core_zh_TW.properties | 0 .../org/forgerock/opendj/ldif/addrate.template | 0 .../main/resources/org/forgerock/opendj/ldif/cities | 0 .../org/forgerock/opendj/ldif/example.template | 0 .../resources/org/forgerock/opendj/ldif/first.names | 0 .../resources/org/forgerock/opendj/ldif/last.names | 0 .../forgerock/opendj/ldif/people_and_groups.template | 0 .../main/resources/org/forgerock/opendj/ldif/states | 0 .../main/resources/org/forgerock/opendj/ldif/streets | 0 .../src/site/xdoc/index.xml.vm | 0 .../AccountUsabilityRequestControlTestCase.java | 0 .../AccountUsabilityResponseControlTestCase.java | 0 .../forgerock/opendj/util/ASCIICharPropTestCase.java | 0 .../opendj/util/OperatingSystemTestCase.java | 0 .../opendj/util/ReferenceCountedObjectTestCase.java | 0 .../forgerock/opendj/util/StaticUtilsTestCase.java | 0 .../opendj/util/StringPrepProfileTestCase.java | 0 .../java/com/forgerock/opendj/util/UtilTestCase.java | 0 .../opendj/io/ASN1ByteSequenceReaderTestCase.java | 0 .../opendj/io/ASN1InputStreamReaderTestCase.java | 0 .../opendj/io/ASN1OutputStreamWriterTestCase.java | 0 .../org/forgerock/opendj/io/ASN1ReaderTestCase.java | 0 .../org/forgerock/opendj/io/ASN1WriterTestCase.java | 0 .../opendj/io/LDAPReaderWriterTestCase.java | 0 .../java/org/forgerock/opendj/ldap/AVATestCase.java | 0 .../ldap/AbstractAsynchronousConnectionTestCase.java | 0 .../forgerock/opendj/ldap/AddressMaskTestCase.java | 0 .../opendj/ldap/AttributeDescriptionTestCase.java | 0 .../opendj/ldap/AttributeParserTestCase.java | 0 .../forgerock/opendj/ldap/AttributesTestCase.java | 0 .../opendj/ldap/ByteSequenceReaderTest.java | 0 .../forgerock/opendj/ldap/ByteSequenceTestCase.java | 0 .../opendj/ldap/ByteStringBuilderTestCase.java | 0 .../forgerock/opendj/ldap/ByteStringTestCase.java | 0 .../org/forgerock/opendj/ldap/CompactDnTestCase.java | 0 .../opendj/ldap/ConditionResultTestCase.java | 0 .../opendj/ldap/ConnectionPoolTestCase.java | 0 .../forgerock/opendj/ldap/ConnectionsTestCase.java | 0 .../java/org/forgerock/opendj/ldap/DNTestCase.java | 0 .../forgerock/opendj/ldap/DataProviderIterator.java | 0 .../org/forgerock/opendj/ldap/EntriesTestCase.java | 0 .../org/forgerock/opendj/ldap/EntryTestCase.java | 0 .../org/forgerock/opendj/ldap/FilterTestCase.java | 0 .../forgerock/opendj/ldap/GSERParserTestCase.java | 0 .../forgerock/opendj/ldap/GeneralizedTimeTest.java | 0 .../ldap/HeartBeatConnectionFactoryTestCase.java | 0 .../java/org/forgerock/opendj/ldap/LDAPServer.java | 0 .../org/forgerock/opendj/ldap/LDAPUrlTestCase.java | 0 .../opendj/ldap/LinkedAttributeTestCase.java | 0 .../forgerock/opendj/ldap/LoadBalancerTestCase.java | 0 .../forgerock/opendj/ldap/MemoryBackendTestCase.java | 0 .../opendj/ldap/MockConnectionEventListener.java | 0 .../org/forgerock/opendj/ldap/MockScheduler.java | 0 .../opendj/ldap/ModificationTypeTestCase.java | 0 .../forgerock/opendj/ldap/PackedLongTestCase.java | 0 .../java/org/forgerock/opendj/ldap/RDNTestCase.java | 0 .../opendj/ldap/RequestLoadBalancerTestCase.java | 0 .../forgerock/opendj/ldap/ResultCodeTestCase.java | 0 .../java/org/forgerock/opendj/ldap/SdkTestCase.java | 0 .../forgerock/opendj/ldap/SearchScopeTestCase.java | 0 .../org/forgerock/opendj/ldap/TestCaseUtils.java | 0 .../forgerock/opendj/ldap/TestCaseUtilsTestCase.java | 0 .../opendj/ldap/controls/ControlsTestCase.java | 0 .../opendj/ldap/requests/AbandonRequestTestCase.java | 0 .../opendj/ldap/requests/AddRequestTestCase.java | 0 .../requests/AnonymousSASLBindRequestTestCase.java | 0 .../opendj/ldap/requests/BindRequestTestCase.java | 0 .../requests/CRAMMD5SASLBindRequestTestCase.java | 0 .../ldap/requests/CancelExtendedRequestTestCase.java | 0 .../opendj/ldap/requests/CompareRequestTestCase.java | 0 .../opendj/ldap/requests/DeleteRequestTestCase.java | 0 .../requests/DigestMD5SASLBindRequestTestCase.java | 0 .../ldap/requests/ExtendedRequestTestCase.java | 0 .../requests/ExternalSASLBindRequestTestCase.java | 0 .../ldap/requests/GSSAPISASLBindRequestTestCase.java | 0 .../ldap/requests/GenericBindRequestTestCase.java | 0 .../requests/GenericExtendedRequestTestCase.java | 0 .../ldap/requests/ModifyDNRequestTestCase.java | 0 .../opendj/ldap/requests/ModifyRequestTestCase.java | 0 .../PasswordModifyExtendedRequestTestCase.java | 0 .../ldap/requests/PlainSASLBindRequestTestCase.java | 0 .../opendj/ldap/requests/RequestsTestCase.java | 0 .../opendj/ldap/requests/SearchRequestTestCase.java | 0 .../ldap/requests/SimpleBindRequestTestCase.java | 0 .../requests/StartTLSExtendedRequestTestCase.java | 0 .../opendj/ldap/requests/UnbindRequestTestCase.java | 0 .../ldap/requests/WhoAmIExtendedRequestTestCase.java | 0 .../opendj/ldap/responses/ResponsesTestCase.java | 0 .../ldap/schema/AbstractSchemaElementTestCase.java | 0 .../opendj/ldap/schema/AbstractSchemaTestCase.java | 0 .../AbstractSubstringMatchingRuleImplTest.java | 0 .../opendj/ldap/schema/AbstractSyntaxTestCase.java | 0 .../ldap/schema/ApproximateMatchingRuleTest.java | 0 .../ldap/schema/AttributeTypeBuilderTestCase.java | 0 .../opendj/ldap/schema/AttributeTypeSyntaxTest.java | 0 .../opendj/ldap/schema/AttributeTypeTest.java | 0 .../ldap/schema/AuthPasswordSyntaxImplTest.java | 0 .../schema/BitStringEqualityMatchingRuleTest.java | 0 .../opendj/ldap/schema/BitStringSyntaxTest.java | 0 .../ldap/schema/BooleanEqualityMatchingRuleTest.java | 0 .../opendj/ldap/schema/BooleanSyntaxTest.java | 0 .../schema/CaseExactEqualityMatchingRuleTest.java | 0 .../schema/CaseExactIA5EqualityMatchingRuleTest.java | 0 .../CaseExactIA5SubstringMatchingRuleTest.java | 0 .../schema/CaseExactOrderingMatchingRuleTest.java | 0 .../schema/CaseExactSubstringMatchingRuleTest.java | 0 .../schema/CaseIgnoreEqualityMatchingRuleTest.java | 0 .../CaseIgnoreIA5EqualityMatchingRuleTest.java | 0 .../CaseIgnoreIA5SubstringMatchingRuleTest.java | 0 .../schema/CaseIgnoreOrderingMatchingRuleTest.java | 0 .../schema/CaseIgnoreSubstringMatchingRuleTest.java | 0 .../schema/CertificateExactMatchingRuleImplTest.java | 0 .../opendj/ldap/schema/CertificateSyntaxTest.java | 0 .../schema/CollationEqualityMatchingRuleTest.java | 0 .../schema/CollationGreaterThanMatchingRuleTest.java | 0 .../CollationGreaterThanOrEqualMatchingRuleTest.java | 0 .../schema/CollationLessThanMatchingRuleTest.java | 0 .../CollationLessThanOrEqualMatchingRuleTest.java | 0 .../schema/CollationSubstringMatchingRuleTest.java | 0 .../forgerock/opendj/ldap/schema/CoreSchemaTest.java | 0 .../opendj/ldap/schema/CountryStringSyntaxTest.java | 0 .../opendj/ldap/schema/DITContentRuleSyntaxTest.java | 0 .../opendj/ldap/schema/DITContentRuleTestCase.java | 0 .../opendj/ldap/schema/DITStructureRuleTestCase.java | 0 ...StringFirstComponentEqualityMatchingRuleTest.java | 0 .../DistinguishedNameEqualityMatchingRuleTest.java | 0 .../ldap/schema/EntrySchemaCheckingTestCase.java | 0 .../opendj/ldap/schema/EnumSyntaxTestCase.java | 0 .../GeneralizedTimeEqualityMatchingRuleTest.java | 0 .../GeneralizedTimeOrderingMatchingRuleTest.java | 0 .../ldap/schema/GeneralizedTimeSyntaxTest.java | 0 .../opendj/ldap/schema/GuideSyntaxTest.java | 0 .../opendj/ldap/schema/IA5StringSyntaxTest.java | 0 .../ldap/schema/IntegerEqualityMatchingRuleTest.java | 0 .../ldap/schema/IntegerOrderingMatchingRuleTest.java | 0 .../opendj/ldap/schema/IntegerSyntaxTest.java | 0 .../forgerock/opendj/ldap/schema/JPEGSyntaxTest.java | 0 .../forgerock/opendj/ldap/schema/LDAPSyntaxTest.java | 0 .../opendj/ldap/schema/MatchingRuleSyntaxTest.java | 0 .../opendj/ldap/schema/MatchingRuleTest.java | 0 .../opendj/ldap/schema/MatchingRuleTestCase.java | 0 .../ldap/schema/MatchingRuleUseBuilderTestCase.java | 0 .../ldap/schema/MatchingRuleUseSyntaxTest.java | 0 .../opendj/ldap/schema/NameFormTestCase.java | 0 .../NumericStringEqualityMatchingRuleTest.java | 0 .../NumericStringOrderingMatchingRuleTest.java | 0 .../NumericStringSubstringMatchingRuleTest.java | 0 .../ldap/schema/ObjectClassBuilderTestCase.java | 0 .../opendj/ldap/schema/OrderingMatchingRuleTest.java | 0 .../opendj/ldap/schema/OtherMailboxSyntaxTest.java | 0 .../PartialDateAndTimeMatchingRuleTestCase.java | 0 .../PresentationAddressEqualityMatchingRuleTest.java | 0 .../ProtocolInformationEqualityMatchingRuleTest.java | 0 .../opendj/ldap/schema/RegexSyntaxTestCase.java | 0 .../RelativeTimeGreaterThanMatchingRuleTest.java | 0 .../schema/RelativeTimeLessThanMatchingRuleTest.java | 0 .../opendj/ldap/schema/SchemaBuilderTestCase.java | 0 .../opendj/ldap/schema/SchemaCompatTest.java | 0 .../opendj/ldap/schema/SchemaOptionsTestCase.java | 0 .../forgerock/opendj/ldap/schema/SchemaTestCase.java | 0 .../opendj/ldap/schema/SchemaUtilsTest.java | 0 .../ldap/schema/SubstitutionSyntaxTestCase.java | 0 .../ldap/schema/SubstringMatchingRuleTest.java | 0 .../forgerock/opendj/ldap/schema/SyntaxTestCase.java | 0 .../ldap/schema/TelephoneNumberSyntaxTest.java | 0 .../opendj/ldap/schema/TelexSyntaxTest.java | 0 .../opendj/ldap/schema/UTCTimeSyntaxTest.java | 0 .../ldap/schema/UUIDEqualityMatchingRuleTest.java | 0 .../ldap/schema/UUIDOrderingMatchingRuleTest.java | 0 .../forgerock/opendj/ldap/schema/UUIDSyntaxTest.java | 0 .../schema/UniqueMemberEqualityMatchingRuleTest.java | 0 .../UserPasswordExactEqualityMatchingRuleTest.java | 0 .../ldap/schema/WordEqualityMatchingRuleTest.java | 0 .../opendj/ldap/spi/BasicLDAPConnectionFactory.java | 0 .../forgerock/opendj/ldap/spi/BasicLDAPListener.java | 0 .../opendj/ldap/spi/BasicTransportProvider.java | 0 .../opendj/ldap/spi/ConnectionStateTest.java | 0 .../org/forgerock/opendj/ldap/spi/LDAPTestCase.java | 0 .../forgerock/opendj/ldif/AbstractLDIFTestCase.java | 0 .../ldif/ConnectionChangeRecordWriterTestCase.java | 0 .../opendj/ldif/ConnectionEntryReaderTestCase.java | 0 .../opendj/ldif/ConnectionEntryWriterTestCase.java | 0 .../opendj/ldif/EntryGeneratorTestCase.java | 0 .../opendj/ldif/LDIFChangeRecordReaderTestCase.java | 0 .../opendj/ldif/LDIFChangeRecordWriterTestCase.java | 0 .../opendj/ldif/LDIFEntryReaderTestCase.java | 0 .../opendj/ldif/LDIFEntryWriterTestCase.java | 0 .../java/org/forgerock/opendj/ldif/LDIFTestCase.java | 0 .../forgerock/opendj/ldif/TemplateTagTestcase.java | 0 .../org.forgerock.opendj.ldap.spi.TransportProvider | 0 {opendj-grizzly => opendj-sdk-grizzly}/pom.xml | 8 ++++---- .../opendj/grizzly/GrizzlyTransportProvider.java | 0 .../com/forgerock/opendj/grizzly/package-info.java | 0 .../forgerock/opendj/grizzly/ASN1BufferReader.java | 0 .../forgerock/opendj/grizzly/ASN1BufferWriter.java | 0 .../grizzly/ConnectionSecurityLayerFilter.java | 0 .../opendj/grizzly/DefaultTCPNIOTransport.java | 0 .../opendj/grizzly/GrizzlyLDAPConnection.java | 0 .../opendj/grizzly/GrizzlyLDAPConnectionFactory.java | 0 .../opendj/grizzly/GrizzlyLDAPListener.java | 0 .../org/forgerock/opendj/grizzly/GrizzlyUtils.java | 0 .../org/forgerock/opendj/grizzly/LDAPBaseFilter.java | 0 .../forgerock/opendj/grizzly/LDAPClientFilter.java | 0 .../forgerock/opendj/grizzly/LDAPServerFilter.java | 0 .../org/forgerock/opendj/grizzly/package-info.java | 0 .../org.forgerock.opendj.ldap.spi.TransportProvider | 0 .../com/forgerock/opendj/grizzly/grizzly.properties | 0 .../src/site/xdoc/index.xml.vm | 0 .../opendj/grizzly/ASN1BufferReaderTestCase.java | 0 .../opendj/grizzly/ASN1BufferWriterTestCase.java | 0 .../opendj/grizzly/ConnectionFactoryTestCase.java | 0 .../grizzly/DefaultTCPNIOTransportTestCase.java | 0 .../GrizzlyLDAPConnectionFactoryTestCase.java | 0 .../grizzly/GrizzlyLDAPConnectionTestCase.java | 0 .../opendj/grizzly/GrizzlyLDAPListenerTestCase.java | 0 .../grizzly/GrizzlyLDAPReaderWriterTestCase.java | 0 .../opendj/grizzly/GrizzlyUtilsTestCase.java | 0 pom.xml | 6 +++--- 696 files changed, 26 insertions(+), 26 deletions(-) rename {opendj-core => opendj-sdk-core}/clirr-ignored-api-changes.xml (100%) rename {opendj-core => opendj-sdk-core}/pom.xml (99%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/Collections2.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/Iterables.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/Iterators.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/OperatingSystem.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/PackedLong.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/Predicate.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/StaticUtils.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/SubstringReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/com/forgerock/opendj/util/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1Reader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/ASN1Writer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/LDAP.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/LDAPReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/LDAPWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/io/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AVA.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AddressMask.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Assertion.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Attribute.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Attributes.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Base64.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ByteString.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Connection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Connections.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/DN.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/DecodeException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Entries.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Entry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Filter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Functions.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/GSERParser.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LdapException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Matcher.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/Modification.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ModificationType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RDN.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ReferralException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RequestContext.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ResultCode.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/RootDSE.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SearchScope.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/SortKey.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/Control.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/Request.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/Response.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/Result.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/EntryReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/LDIF.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/java/org/forgerock/opendj/ldif/package-info.java (100%) rename {opendj-core => opendj-sdk-core}/src/main/javadoc/overview.html (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_de.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_es.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/addrate.template (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/cities (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/example.template (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/first.names (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/last.names (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/states (100%) rename {opendj-core => opendj-sdk-core}/src/main/resources/org/forgerock/opendj/ldif/streets (100%) rename {opendj-core => opendj-sdk-core}/src/site/xdoc/index.xml.vm (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/com/forgerock/opendj/util/UtilTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java (100%) rename {opendj-core => opendj-sdk-core}/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/pom.xml (95%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/com/forgerock/opendj/grizzly/package-info.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/java/org/forgerock/opendj/grizzly/package-info.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/site/xdoc/index.xml.vm (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java (100%) rename {opendj-grizzly => opendj-sdk-grizzly}/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java (100%) diff --git a/README.md b/README.md index 467bdcb2c..d04cf12e1 100644 --- a/README.md +++ b/README.md @@ -64,13 +64,13 @@ network transport. Remember to override the version according to your needs: org.forgerock.opendj - opendj-core - 3.0.0 + opendj-sdk-core + 4.0.0-SNAPSHOT org.forgerock.opendj - opendj-grizzly - 3.0.0 + opendj-sdk-grizzly + 4.0.0-SNAPSHOT ``` @@ -82,8 +82,8 @@ required, in which case you can simply declare a dependency on the OpenDJ core A org.forgerock.opendj - opendj-core - 3.0.0 + opendj-sdk-core + 4.0.0-SNAPSHOT ``` diff --git a/opendj-cli/pom.xml b/opendj-cli/pom.xml index cc2362ff9..23c6c81a7 100644 --- a/opendj-cli/pom.xml +++ b/opendj-cli/pom.xml @@ -32,12 +32,12 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core org.forgerock.opendj - opendj-core + opendj-sdk-core test-jar test diff --git a/opendj-doc-maven-plugin/pom.xml b/opendj-doc-maven-plugin/pom.xml index b60c44f15..54b400bcb 100644 --- a/opendj-doc-maven-plugin/pom.xml +++ b/opendj-doc-maven-plugin/pom.xml @@ -36,7 +36,7 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core diff --git a/opendj-ldap-sdk-examples/pom.xml b/opendj-ldap-sdk-examples/pom.xml index 661de1ae2..e2b65fce6 100644 --- a/opendj-ldap-sdk-examples/pom.xml +++ b/opendj-ldap-sdk-examples/pom.xml @@ -30,12 +30,12 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core org.forgerock.opendj - opendj-grizzly + opendj-sdk-grizzly diff --git a/opendj-ldap-toolkit/pom.xml b/opendj-ldap-toolkit/pom.xml index b364e2111..3cb329e7f 100644 --- a/opendj-ldap-toolkit/pom.xml +++ b/opendj-ldap-toolkit/pom.xml @@ -43,12 +43,12 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core org.forgerock.opendj - opendj-grizzly + opendj-sdk-grizzly @@ -73,7 +73,7 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core test-jar test diff --git a/opendj-rest2ldap/pom.xml b/opendj-rest2ldap/pom.xml index 4bcce5ec6..f58b6ac9d 100644 --- a/opendj-rest2ldap/pom.xml +++ b/opendj-rest2ldap/pom.xml @@ -40,7 +40,7 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core diff --git a/opendj-sdk-bom/pom.xml b/opendj-sdk-bom/pom.xml index 1d0ff0446..680ddfb03 100644 --- a/opendj-sdk-bom/pom.xml +++ b/opendj-sdk-bom/pom.xml @@ -68,7 +68,7 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core ${opendj.sdk.version} @@ -80,7 +80,7 @@ org.forgerock.opendj - opendj-grizzly + opendj-sdk-grizzly ${opendj.sdk.version} diff --git a/opendj-core/clirr-ignored-api-changes.xml b/opendj-sdk-core/clirr-ignored-api-changes.xml similarity index 100% rename from opendj-core/clirr-ignored-api-changes.xml rename to opendj-sdk-core/clirr-ignored-api-changes.xml diff --git a/opendj-core/pom.xml b/opendj-sdk-core/pom.xml similarity index 99% rename from opendj-core/pom.xml rename to opendj-sdk-core/pom.xml index 99e59aa04..eafab9a3a 100644 --- a/opendj-core/pom.xml +++ b/opendj-sdk-core/pom.xml @@ -23,8 +23,8 @@ 4.0.0-SNAPSHOT - opendj-core - OpenDJ Core APIs + opendj-sdk-core + OpenDJ SDK Core APIs This module provides the core APIs required for implementing LDAP Directory client and server applications. Unlike the SDK this module does not diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControl.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControl.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/RealAttributesOnlyRequestControl.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/TransactionIdControl.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/VirtualAttributesOnlyRequestControl.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/controls/package-info.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedRequest.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetConnectionIDExtendedResult.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/GetSymmetricKeyExtendedRequest.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedRequest.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateExtendedResult.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperation.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationContainer.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/PasswordPolicyStateOperationType.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/ldap/extensions/package-info.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/ASCIICharProp.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Collections2.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/Collections2.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Collections2.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Iterables.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/Iterables.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Iterables.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Iterators.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/Iterators.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Iterators.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/OperatingSystem.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/PackedLong.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/PackedLong.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/PackedLong.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Predicate.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/Predicate.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/Predicate.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/ReferenceCountedObject.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/SizeLimitInputStream.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/StaticUtils.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/StringPrepProfile.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/SubstringReader.java diff --git a/opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java b/opendj-sdk-core/src/main/java/com/forgerock/opendj/util/package-info.java similarity index 100% rename from opendj-core/src/main/java/com/forgerock/opendj/util/package-info.java rename to opendj-sdk-core/src/main/java/com/forgerock/opendj/util/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1ByteSequenceReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1InputStreamReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1OutputStreamWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1Reader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/ASN1Writer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Reader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractASN1Writer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/AbstractLDAPMessageHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAP.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/LDAP.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAP.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPMessageHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/LDAPWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/io/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/io/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/io/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AVA.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AVA.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AVA.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractAttribute.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractConnectionWrapper.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractEntry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractFilterVisitor.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractMapEntry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AbstractSynchronousConnection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AddressMask.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Assertion.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AssertionFailureException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Attribute.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeDescription.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeFilter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AttributeParser.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Attributes.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AuthenticationException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/AuthorizationException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Base64.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Base64.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Base64.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteSequence.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteSequenceReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteString.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ByteStringBuilder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CachedConnectionPool.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CancelRequestListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CancelledResultException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/CommonLDAPOptions.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConditionResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Connection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Connection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Connection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionEventListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionLoadBalancer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionPool.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConnectionSecurityLayer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Connections.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Connections.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ConstraintViolationException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DN.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/DN.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DN.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DecodeException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DecodeOptions.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/DereferenceAliasesPolicy.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Entries.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Entries.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Entries.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Entry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Entry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Entry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/EntryFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/EntryNotFoundException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Filter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Filter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Filter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/FilterVisitor.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Functions.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Functions.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Functions.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/GSERParser.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/GeneralizedTime.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/IntermediateResponseHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/KeyManagers.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPClientContext.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPConnectionFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LDAPUrl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapPromise.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LdapResultHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LinkedAttribute.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LinkedHashMapEntry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/LoadBalancerEventListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Matcher.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/MemoryBackend.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Modification.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/Modification.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/Modification.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ModificationType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/MultipleEntriesFoundException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ProviderNotFoundException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RDN.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RDN.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RDN.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ReferralException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestContext.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestHandlerFactoryAdapter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RequestLoadBalancer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ResultCode.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/RootDSE.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SSLContextBuilder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SchemaResolver.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchResultHandler.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchResultReferenceIOException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SearchScope.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ServerConnection.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/ServerConnectionFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/SortKey.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutChecker.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutEventListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TimeoutResultException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TreeMapEntry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/TrustManagers.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ADNotificationRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AssertionRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/AuthorizationIdentityResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/Control.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ControlDecoder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/EntryChangeNotificationResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/GenericControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/GetEffectiveRightsRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ManageDsaITRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/MatchedValuesRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiredResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordExpiringResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyErrorType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PasswordPolicyWarningType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PermissiveModifyRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchChangeType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PersistentSearchRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PostReadResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/PreReadResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV1RequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ProxiedAuthV2RequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/ServerSideSortResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SimplePagedResultsControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SubentriesRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/SubtreeDeleteRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewRequestControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/VirtualListViewResponseControl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/controls/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbandonRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractSASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AbstractUnmodifiableSASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AddRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClient.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindClientImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/BindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/CompareRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DeleteRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExtendedRequestDecoder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/ModifyRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/Request.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/Requests.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindClientImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SASLBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SearchRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnbindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAbandonRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAddRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableAnonymousSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCRAMMD5SASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCancelExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableCompareRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDeleteRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableDigestMD5SASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableExternalSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGSSAPISASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableGenericExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyDNRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableModifyRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePasswordModifyExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiablePlainSASLBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSearchRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableSimpleBindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableStartTLSExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableUnbindRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/UnmodifiableWhoAmIExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequest.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/requests/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractExtendedResultDecoder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractIntermediateResponse.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResponseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableIntermediateResponseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResponseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/AbstractUnmodifiableResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/BindResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/CompareResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ExtendedResultDecoder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponse.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/GenericIntermediateResponseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/IntermediateResponse.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/PasswordModifyExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Response.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Responses.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/Result.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/ResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntry.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultEntryImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReference.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/SearchResultReferenceImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableBindResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableCompareResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableGenericIntermediateResponseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiablePasswordModifyExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultEntryImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableSearchResultReferenceImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/UnmodifiableWhoAmIExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResult.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/WhoAmIExtendedResultImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/responses/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractApproximateMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AttributeUsage.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordExactEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BinarySyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreListSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactAssertionSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateListSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificatePairSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CollationMatchingRulesImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ConflictingSchemaElementException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchema.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CoreSchemaSupportedLocales.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRule.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRule.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DITStructureRuleSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DelayedSchema.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DeliveryMethodSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DirectoryStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DistinguishedNameSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/DoubleMetaphoneApproximateMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumOrderingMatchingRule.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/EnumSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/FacsimileNumberSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/FaxSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GenerateCoreSchema.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/GuideSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/KeywordEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxDescriptionSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRule.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUse.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameAndOptionalUIDSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameForm.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/NumericStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OIDSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClass.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassType.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ObjectIdentifierFirstComponentEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OctetStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PostalAddressSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PresentationAddressSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/PrintableStringSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/ProtocolInformationSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/RegexSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/Schema.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaBuilder.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaConstants.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaElement.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaOptions.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaUtils.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SchemaValidationPolicy.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SubstringAssertionSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SupportedAlgorithmSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/Syntax.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/SyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSubstringMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TeletexTerminalIdentifierSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TelexNumberSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/TimeBasedMatchingRulesImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UnknownSchemaElementException.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/UserPasswordSyntaxImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/schema/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/BindResultLdapPromiseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ExtendedResultLdapPromiseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexQueryFactory.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/Indexer.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/IndexingOptions.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionFactoryImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPConnectionImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LDAPListenerImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromiseWrapper.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/LdapPromises.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/Provider.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/ResultLdapPromiseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/SearchResultLdapPromiseImpl.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/TransportProvider.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldap/spi/package-info.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFStream.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/AbstractLDIFWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecord.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitor.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordVisitorWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ChangeRecordWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/ConnectionEntryWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryGenerator.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/EntryWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIF.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryReader.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/LDIFEntryWriter.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/RejectedChangeRecordListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/RejectedLDIFListener.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/TemplateFile.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/TemplateTag.java diff --git a/opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java b/opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/package-info.java similarity index 100% rename from opendj-core/src/main/java/org/forgerock/opendj/ldif/package-info.java rename to opendj-sdk-core/src/main/java/org/forgerock/opendj/ldif/package-info.java diff --git a/opendj-core/src/main/javadoc/overview.html b/opendj-sdk-core/src/main/javadoc/overview.html similarity index 100% rename from opendj-core/src/main/javadoc/overview.html rename to opendj-sdk-core/src/main/javadoc/overview.html diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_de.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_es.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_fr.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_ja.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_ko.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_CN.properties diff --git a/opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties b/opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties similarity index 100% rename from opendj-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties rename to opendj-sdk-core/src/main/resources/com/forgerock/opendj/ldap/core_zh_TW.properties diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/addrate.template b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/addrate.template similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/addrate.template rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/addrate.template diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/cities similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/cities rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/cities diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/example.template similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/example.template rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/example.template diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/first.names similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/first.names rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/first.names diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/last.names similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/last.names rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/last.names diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/people_and_groups.template diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/states b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/states similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/states rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/states diff --git a/opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets b/opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/streets similarity index 100% rename from opendj-core/src/main/resources/org/forgerock/opendj/ldif/streets rename to opendj-sdk-core/src/main/resources/org/forgerock/opendj/ldif/streets diff --git a/opendj-core/src/site/xdoc/index.xml.vm b/opendj-sdk-core/src/site/xdoc/index.xml.vm similarity index 100% rename from opendj-core/src/site/xdoc/index.xml.vm rename to opendj-sdk-core/src/site/xdoc/index.xml.vm diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityRequestControlTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/ldap/controls/AccountUsabilityResponseControlTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/ASCIICharPropTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/OperatingSystemTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/ReferenceCountedObjectTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/StaticUtilsTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/StringPrepProfileTestCase.java diff --git a/opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java b/opendj-sdk-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java similarity index 100% rename from opendj-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java rename to opendj-sdk-core/src/test/java/com/forgerock/opendj/util/UtilTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1ByteSequenceReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1InputStreamReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1OutputStreamWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1ReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/ASN1WriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/io/LDAPReaderWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AVATestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AbstractAsynchronousConnectionTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AddressMaskTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributeDescriptionTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributeParserTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/AttributesTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceReaderTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteSequenceTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteStringBuilderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConditionResultTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ConnectionsTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/DNTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/DataProviderIterator.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/EntriesTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/EntryTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/FilterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/GSERParserTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/GeneralizedTimeTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactoryTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LDAPServer.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LDAPUrlTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LinkedAttributeTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/LoadBalancerTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MemoryBackendTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MockConnectionEventListener.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/MockScheduler.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ModificationTypeTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/PackedLongTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/RDNTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/RequestLoadBalancerTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/ResultCodeTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/SdkTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/SearchScopeTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtils.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/TestCaseUtilsTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/controls/ControlsTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AbandonRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AddRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/AnonymousSASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/BindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CRAMMD5SASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CancelExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/CompareRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/DeleteRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/DigestMD5SASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ExternalSASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GSSAPISASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/GenericExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/PasswordModifyExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/PlainSASLBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/RequestsTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/SearchRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/SimpleBindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/StartTLSExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/UnbindRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/requests/WhoAmIExtendedRequestTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/responses/ResponsesTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaElementTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSchemaTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSubstringMatchingRuleImplTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AbstractSyntaxTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ApproximateMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeBuilderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AttributeTypeTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/AuthPasswordSyntaxImplTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BitStringSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/BooleanSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5EqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactIA5SubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseExactSubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5EqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreIA5SubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CaseIgnoreSubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateExactMatchingRuleImplTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CertificateSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationGreaterThanOrEqualMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationLessThanOrEqualMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CollationSubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CoreSchemaTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/CountryStringSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITContentRuleTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DITStructureRuleTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DirectoryStringFirstComponentEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/DistinguishedNameEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/EntrySchemaCheckingTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/EnumSyntaxTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GeneralizedTimeSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/GuideSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IA5StringSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/IntegerSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/JPEGSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/LDAPSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseBuilderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/MatchingRuleUseSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NameFormTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/NumericStringSubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ObjectClassBuilderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/OrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/OtherMailboxSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/PartialDateAndTimeMatchingRuleTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/PresentationAddressEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/ProtocolInformationEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RegexSyntaxTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeGreaterThanMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/RelativeTimeLessThanMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaBuilderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaCompatTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaOptionsTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SchemaUtilsTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstitutionSyntaxTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SubstringMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/SyntaxTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/TelephoneNumberSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/TelexSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UTCTimeSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDOrderingMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UUIDSyntaxTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UniqueMemberEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/UserPasswordExactEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/schema/WordEqualityMatchingRuleTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/AbstractLDIFTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionChangeRecordWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/EntryGeneratorTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryReaderTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFEntryWriterTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java b/opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java similarity index 100% rename from opendj-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java rename to opendj-sdk-core/src/test/java/org/forgerock/opendj/ldif/TemplateTagTestcase.java diff --git a/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider similarity index 100% rename from opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider rename to opendj-sdk-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider diff --git a/opendj-grizzly/pom.xml b/opendj-sdk-grizzly/pom.xml similarity index 95% rename from opendj-grizzly/pom.xml rename to opendj-sdk-grizzly/pom.xml index d684b16ce..c8a76a434 100644 --- a/opendj-grizzly/pom.xml +++ b/opendj-sdk-grizzly/pom.xml @@ -23,8 +23,8 @@ 4.0.0-SNAPSHOT - opendj-grizzly - OpenDJ Grizzly Transport Provider + opendj-sdk-grizzly + OpenDJ SDK Grizzly Transport Provider This module includes a Grizzly based network transport provider for OpenDJ. bundle @@ -38,12 +38,12 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core org.forgerock.opendj - opendj-core + opendj-sdk-core test-jar test diff --git a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java b/opendj-sdk-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java similarity index 100% rename from opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java rename to opendj-sdk-grizzly/src/main/java/com/forgerock/opendj/grizzly/GrizzlyTransportProvider.java diff --git a/opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java b/opendj-sdk-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java similarity index 100% rename from opendj-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java rename to opendj-sdk-grizzly/src/main/java/com/forgerock/opendj/grizzly/package-info.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferReader.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ASN1BufferWriter.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/ConnectionSecurityLayerFilter.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransport.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnection.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactory.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListener.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/GrizzlyUtils.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPBaseFilter.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPClientFilter.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java diff --git a/opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java b/opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java similarity index 100% rename from opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java rename to opendj-sdk-grizzly/src/main/java/org/forgerock/opendj/grizzly/package-info.java diff --git a/opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj-sdk-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider similarity index 100% rename from opendj-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider rename to opendj-sdk-grizzly/src/main/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider diff --git a/opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties b/opendj-sdk-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties similarity index 100% rename from opendj-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties rename to opendj-sdk-grizzly/src/main/resources/com/forgerock/opendj/grizzly/grizzly.properties diff --git a/opendj-grizzly/src/site/xdoc/index.xml.vm b/opendj-sdk-grizzly/src/site/xdoc/index.xml.vm similarity index 100% rename from opendj-grizzly/src/site/xdoc/index.xml.vm rename to opendj-sdk-grizzly/src/site/xdoc/index.xml.vm diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferReaderTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ASN1BufferWriterTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPListenerTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPReaderWriterTestCase.java diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java b/opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java similarity index 100% rename from opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java rename to opendj-sdk-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyUtilsTestCase.java diff --git a/pom.xml b/pom.xml index cc4cc5a66..043132d6f 100644 --- a/pom.xml +++ b/pom.xml @@ -134,8 +134,8 @@ opendj-sdk-bom opendj-doc-maven-plugin - opendj-core - opendj-grizzly + opendj-sdk-core + opendj-sdk-grizzly opendj-cli opendj-ldap-toolkit opendj-ldap-sdk-examples @@ -185,7 +185,7 @@ org.forgerock.opendj - opendj-core + opendj-sdk-core test-jar ${project.version} test From 32f699935add38c83fa80982f356e1e5ca1df84b Mon Sep 17 00:00:00 2001 From: vharseko Date: Thu, 30 Nov 2017 17:26:03 +0300 Subject: [PATCH 125/125] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df2ef0cca..9d542dd61 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ branches: - master notifications: email: - - support@openam.org.ru + - open-identity-platform-opendj@googlegroups.com cache: directories: - $HOME/.m2