OPENDJ-2772 Package sdk tools in the server archive

Gaetan Boismal

28.25.2016 cbfe71b8a7b78463f9abd9a50392ab4b46b6375c

OPENDJ-2772 Package sdk tools in the server archive

Unpack the opendj-ldap-toolkit zip artefact binairies in the bat/ and
bin/ archive folders.

 opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java

@@ -868,7 +868,7 @@
     * Testing the diff function. The following example is extracted from the admin guide.
     *
     * @see <a
     *      href=http://opendj.forgerock.org/doc/admin-guide/index.html#ldif-diff
     *      href=http://opendj.forgerock.org/doc/admin-guide/index.html#ldifdiff
     *      -1 result”>Admin Guide</a>
     * @throws Exception
     */

 opendj-server-legacy/pom.xml

@@ -993,6 +993,33 @@
        </executions>
      </plugin>

      <!-- Unpack files from OpenDJ standard archive -->
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-dependency-plugin</artifactId>
        <executions>
          <execution>
            <id>unpack-archive</id>
            <phase>package</phase>
            <goals>
              <goal>unpack</goal>
            </goals>
            <configuration>
              <artifactItems>
                <artifactItem>
                  <groupId>org.forgerock.opendj</groupId>
                  <artifactId>opendj-ldap-toolkit</artifactId>
                  <version>${project.version}</version>
                  <type>zip</type>
                  <overWrite>true</overWrite>
                  <outputDirectory>${project.build.directory}</outputDirectory>
                </artifactItem>
              </artifactItems>
            </configuration>
          </execution>
        </executions>
      </plugin>

      <plugin>
        <artifactId>maven-assembly-plugin</artifactId>
        <executions>

 opendj-server-legacy/src/main/assembly/opendj-archive-component.xml

@@ -30,7 +30,7 @@
    </dependencySet>
  </dependencySets>
  <fileSets>
    <!-- Creates bat/ directory -->
    <!-- Creates bat/ directory with server binaries -->
    <fileSet>
      <directory>${basedir}/resource/bin</directory>
      <outputDirectory>bat</outputDirectory>
@@ -45,7 +45,13 @@
      <lineEnding>windows</lineEnding>
    </fileSet>

    <!-- Creates bin/ directory -->
    <!-- Add opendj-ldap-toolkit binaries into bat/ directory -->
    <fileSet>
      <directory>${project.build.directory}/opendj-ldap-toolkit/bat</directory>
      <outputDirectory>bat</outputDirectory>
    </fileSet>

    <!-- Creates bin/ directory with server and ldap toolkit binaries -->
    <fileSet>
      <directory>${basedir}/resource/bin</directory>
      <outputDirectory>bin</outputDirectory>
@@ -57,6 +63,12 @@
      <directoryMode>755</directoryMode>
    </fileSet>

    <!-- Add opendj-ldap-toolkit binaries into bin/ directory -->
    <fileSet>
      <directory>${project.build.directory}/opendj-ldap-toolkit/bin</directory>
      <outputDirectory>bin</outputDirectory>
    </fileSet>

    <!-- Add legal-notices/THIRDPARTYREADME.txt -->
    <fileSet>
      <directory>${basedir}/legal-notices</directory>

 opendj-server-legacy/src/main/java/org/opends/quicksetup/UserData.java

@@ -922,7 +922,7 @@
    {
        "backup.offline", "dsreplication.offline",
        "encode-password", "export-ldif.offline",
        IMPORT_SCRIPT_NAME, "ldif-diff", "ldifmodify", "ldifsearch",
        IMPORT_SCRIPT_NAME, "ldifdiff", "ldifmodify", "ldifsearch",
        "makeldif", "rebuild-index", "restore.offline", SERVER_SCRIPT_NAME,
        "upgrade", "verify-index", "backendstat"
    };