OPENDJ-1777 Move opendj-server3x-adapter into opendj-server-legacy

Nicolas Capponi

13.50.2015 ce9f1eb916731bf325f5a9e27010dbd82cce1dcc

 opendj-server-legacy/pom.xml

@@ -105,21 +105,6 @@
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-server3x-adapter</artifactId>
      <version>${project.version}</version>
      <exclusions>
        <exclusion>
          <groupId>org.forgerock.opendj</groupId>
          <artifactId>opendj-server</artifactId>
        </exclusion>
        <exclusion>
          <groupId>org.forgerock.opendj</groupId>
          <artifactId>opendj3-server-dev</artifactId>
        </exclusion>
      </exclusions>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-config</artifactId>
      <version>${project.version}</version>
    </dependency>
@@ -372,18 +357,15 @@
          </execution>
        </executions>
      </plugin>
      
      <!-- OpenDJ maven plugin executions -->
      <plugin>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-maven-plugin</artifactId>
        <version>${project.version}</version>
        <artifactId>opendj-manifest-classpath-maven-plugin</artifactId>
        <version>1.0.0-SNAPSHOT</version>
        <executions>
          <!-- Generates manifest classpath files -->
          <execution>
            <id>generate-bootstrap-manifest</id>
            <goals>
              <goal>generate-manifest</goal>
              <goal>generate</goal>
            </goals>
            <configuration>
              <classPathProperty>classpath.bootstrap</classPathProperty>
@@ -393,11 +375,11 @@
                <exclude>org.slf4j:slf4j-jdk14</exclude>
              </excludes>
            </configuration>
          </execution>      
          </execution>
          <execution>
            <id>generate-bootstrap-client-manifest</id>
            <goals>
              <goal>generate-manifest</goal>
              <goal>generate</goal>
            </goals>
            <configuration>
              <classPathProperty>classpath.bootstrap-client</classPathProperty>
@@ -408,15 +390,22 @@
              </excludes>
            </configuration>
          </execution>
      
         <!-- Generate configuration classes from XML definitions -->
         <!-- Leave default lifecycle phase once new config framework migration 
           is done -->
        </executions>
      </plugin>

      <!-- Generate configuration classes from XML definitions -->
      <!-- Leave default lifecycle phase once new config framework migration 
        is done -->
      <plugin>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-config-maven-plugin</artifactId>
        <version>3.0.0-SNAPSHOT</version>
        <executions>
          <execution>
            <id>generate-config</id>
            <phase>generate-sources</phase>
            <goals>
              <goal>generate-config</goal>
              <goal>generate</goal>
            </goals>
            <configuration>
              <phase>none</phase>
@@ -424,58 +413,6 @@
              <isExtension>false</isExtension>
            </configuration>
          </execution>
          
          <!-- Create consolidated schema file for use in upgrade -->
          <execution>
            <id>creates-base-schema-files</id>
            <goals>
              <goal>concat</goal>
            </goals>
            <configuration>
              <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
              <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
              <outputFile>schema.ldif.${buildRevision}</outputFile>
            </configuration>
          </execution>
          
          <!-- Generates references from messages for documentation -->
          <execution>
            <goals>
              <goal>generate-xml-messages-doc</goal>
            </goals>
            <configuration>
              <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
              <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
              <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
              <messageFileNames>
                <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml 
                  file -->
                <messageFileName>admin</messageFileName>
                <messageFileName>backend</messageFileName>
                <messageFileName>config</messageFileName>
                <messageFileName>core</messageFileName>
                <messageFileName>dsconfig</messageFileName>
                <messageFileName>extension</messageFileName>
                <messageFileName>jeb</messageFileName>
                <messageFileName>logger</messageFileName>
                <messageFileName>plugin</messageFileName>
                <messageFileName>protocol</messageFileName>
                <messageFileName>replication</messageFileName>
                <messageFileName>schema</messageFileName>
                <messageFileName>task</messageFileName>
                <messageFileName>tool</messageFileName>
                <messageFileName>utility</messageFileName>

                <!-- Ignore following message files as we document only serious 
                  errors. -->
                <!-- <messageFileName>access_control</messageFileName> -->
                <!-- <messageFileName>admin_tool</messageFileName> -->
                <!-- <messageFileName>quicksetup.properties</messageFileName> -->
                <!-- <messageFileName>runtime_information.properties</messageFileName> -->
                <!-- <messageFileName>version.properties</messageFileName> -->
              </messageFileNames>
            </configuration>
          </execution>
        </executions>
      </plugin>

@@ -546,6 +483,26 @@
        </executions>
      </plugin>

      <!-- Create consolidated schema file for use in upgrade -->
      <plugin>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-concat-schema-maven-plugin</artifactId>
        <version>1.0.0-SNAPSHOT</version>
        <executions>
          <execution>
            <id>creates-base-schema-files</id>
            <goals>
              <goal>concat</goal>
            </goals>
            <configuration>
              <schemaDirectory>${basedir}/resource/schema</schemaDirectory>
              <outputDirectory>${project.build.directory}/upgrade</outputDirectory>
              <outputFile>schema.ldif.${buildRevision}</outputFile>
            </configuration>
          </execution>
        </executions>
      </plugin>

      <!-- Compile unit tests -->
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
@@ -1009,6 +966,52 @@
        </executions>
      </plugin>

      <!-- Generates log references for documentation -->
      <plugin>
        <groupId>org.forgerock.opendj</groupId>
        <artifactId>opendj-logref-doc-maven-plugin</artifactId>
        <version>1.0.0-SNAPSHOT</version>
        <executions>
          <execution>
            <goals>
              <goal>generate-xml-messages-doc</goal>
            </goals>
            <configuration>
              <messagesDirectory>${basedir}/src/messages/org/opends/messages</messagesDirectory>
              <outputDirectory>${project.build.directory}/docgen/logref</outputDirectory>
              <logMessageReferenceFilePath>${basedir}/resource/log-message-reference.xml</logMessageReferenceFilePath>
              <messageFileNames>
                <!-- for xxx_yyy.properties generates a log-ref-xxx-yyy.xml 
                  file -->
                <messageFileName>admin</messageFileName>
                <messageFileName>backend</messageFileName>
                <messageFileName>config</messageFileName>
                <messageFileName>core</messageFileName>
                <messageFileName>dsconfig</messageFileName>
                <messageFileName>extension</messageFileName>
                <messageFileName>jeb</messageFileName>
                <messageFileName>logger</messageFileName>
                <messageFileName>plugin</messageFileName>
                <messageFileName>protocol</messageFileName>
                <messageFileName>replication</messageFileName>
                <messageFileName>schema</messageFileName>
                <messageFileName>task</messageFileName>
                <messageFileName>tool</messageFileName>
                <messageFileName>utility</messageFileName>

                <!-- Ignore following message files as we document only serious 
                  errors. -->
                <!-- <messageFileName>access_control</messageFileName> -->
                <!-- <messageFileName>admin_tool</messageFileName> -->
                <!-- <messageFileName>quicksetup.properties</messageFileName> -->
                <!-- <messageFileName>runtime_information.properties</messageFileName> -->
                <!-- <messageFileName>version.properties</messageFileName> -->
              </messageFileNames>
            </configuration>
          </execution>
        </executions>
      </plugin>

      <!-- Generate documentation (guide) -->
      <plugin>
        <groupId>org.forgerock.commons</groupId>
@@ -1216,6 +1219,8 @@
                  <excludes>
                    <exclude>org/opends/server/snmp/**</exclude>
                    <exclude>org/opends/quicksetup/**</exclude>
                    <exclude>org/opends/quicksetup/**</exclude>
                    <exclude>org/forgerock/opendj/adapter/**</exclude>
                  </excludes>
                  <includes>
                    <include>**/Test*.java</include>