From 47d2767b9dcbe773d73a6532269b7eb0856897d1 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 13 Feb 2015 10:10:41 +0000
Subject: [PATCH] OPENDJ-1777 Add opendj-maven-plugin

---
 opendj-server-legacy/pom.xml |  148 +++++++++++++++++++++---------------------------
 1 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index 8fd7722..a59d68b 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -372,15 +372,18 @@
           </execution>
         </executions>
       </plugin>
+      
+      <!-- OpenDJ maven plugin executions -->
       <plugin>
         <groupId>org.forgerock.opendj</groupId>
-        <artifactId>opendj-manifest-classpath-maven-plugin</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <artifactId>opendj-maven-plugin</artifactId>
+        <version>${project.version}</version>
         <executions>
+          <!-- Generates manifest classpath files -->
           <execution>
             <id>generate-bootstrap-manifest</id>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-manifest</goal>
             </goals>
             <configuration>
               <classPathProperty>classpath.bootstrap</classPathProperty>
@@ -390,11 +393,11 @@
                 <exclude>org.slf4j:slf4j-jdk14</exclude>
               </excludes>
             </configuration>
-          </execution>
+          </execution>      
           <execution>
             <id>generate-bootstrap-client-manifest</id>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-manifest</goal>
             </goals>
             <configuration>
               <classPathProperty>classpath.bootstrap-client</classPathProperty>
@@ -405,22 +408,15 @@
               </excludes>
             </configuration>
           </execution>
-        </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>
+      
+	      <!-- Generate configuration classes from XML definitions -->
+	      <!-- Leave default lifecycle phase once new config framework migration 
+	        is done -->
           <execution>
             <id>generate-config</id>
             <phase>generate-sources</phase>
             <goals>
-              <goal>generate</goal>
+              <goal>generate-config</goal>
             </goals>
             <configuration>
               <phase>none</phase>
@@ -428,6 +424,58 @@
               <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>
 
@@ -498,26 +546,6 @@
         </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>
@@ -981,52 +1009,6 @@
         </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>

--
Gitblit v1.10.0