From c4b207628ac34d5662303245fdffbf8f2e8d71ef Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sun, 29 Sep 2013 17:20:29 +0000
Subject: QPID-5192, QPID-5048: update the maven build in line with previous
 QPID-5192 commit, generate into the src tree but only when -Dgenerate=true is
 used

Moves the JavaCC invocation in common and the antrun-plugin invocation in broker-core to their own profile so they dont run unless requested. The antrun-plugin in common to be similarly moved when other changes to what its doing later become possible.


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1527355 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/common/pom.xml | 88 ++++++++++++++++++++++--------------------------
 1 file changed, 40 insertions(+), 48 deletions(-)

(limited to 'qpid/java/common')

diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index a5ab0cae05..bf944df901 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -28,9 +28,9 @@
 
   <properties>
     <!-- used during the antrun-plugin execution -->
-    <generated-amqp-0-8-dir>${project.build.directory}/generated-sources/generated-amqp-0-8</generated-amqp-0-8-dir>
-    <generated-amqp-0-10-dir>${project.build.directory}/generated-sources/generated-amqp-0-10</generated-amqp-0-10-dir>
-    <selector.output.dir>${project.build.directory}/generated-sources/generated-jms-selector/org/apache/qpid/filter/selector</selector.output.dir>
+    <generated-amqp-0-8-dir>${basedir}/src/main/java</generated-amqp-0-8-dir>
+    <generated-amqp-0-10-dir>${basedir}/src/main/java</generated-amqp-0-10-dir>
+    <selector.output.dir>${basedir}/src/main/java/org/apache/qpid/filter/selector</selector.output.dir>
     <version.file>${project.build.directory}/classes/qpidversion.properties</version.file>
   </properties>
 
@@ -85,28 +85,6 @@
         </configuration>
       </plugin>
 
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>javacc-maven-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>jms-selector-generated</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>javacc</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${selector.output.dir}</outputDirectory>
-              <sourceDirectory>src/main/grammar</sourceDirectory>
-              <includes>
-                <include>SelectorParser.jj</include>
-              </includes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -147,30 +125,44 @@
           </dependency>
         </dependencies>
       </plugin>
-
-      <!-- Add the generated source paths for compilation-->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <id>add-source</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>${generated-amqp-0-8-dir}</source>
-                <source>${generated-amqp-0-10-dir}</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>generate-sources-common</id>
+      <activation>
+        <property>
+          <name>generate</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>javacc-maven-plugin</artifactId>
+          <version>2.6</version>
+          <executions>
+            <execution>
+              <id>jms-selector-generated</id>
+              <phase>generate-sources</phase>
+              <goals>
+                <goal>javacc</goal>
+              </goals>
+              <configuration>
+                <outputDirectory>${selector.output.dir}</outputDirectory>
+                <sourceDirectory>src/main/grammar</sourceDirectory>
+                <includes>
+                  <include>SelectorParser.jj</include>
+                </includes>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
 </project>
-- 
cgit v1.2.1