camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r700841 - in /activemq/camel/trunk/components: camel-rest/pom.xml camel-spring/pom.xml pom.xml
Date Wed, 01 Oct 2008 17:05:30 GMT
Author: janstey
Date: Wed Oct  1 10:05:30 2008
New Revision: 700841

URL: http://svn.apache.org/viewvc?rev=700841&view=rev
Log:
CAMEL-939 - Get the camel-spring and camel-rest tests running on AIX.

Modified:
    activemq/camel/trunk/components/camel-rest/pom.xml
    activemq/camel/trunk/components/camel-spring/pom.xml
    activemq/camel/trunk/components/pom.xml

Modified: activemq/camel/trunk/components/camel-rest/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-rest/pom.xml?rev=700841&r1=700840&r2=700841&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-rest/pom.xml (original)
+++ activemq/camel/trunk/components/camel-rest/pom.xml Wed Oct  1 10:05:30 2008
@@ -149,7 +149,6 @@
       </resource>
     </resources>
 
-
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -222,34 +221,7 @@
           </dependency>
         </dependencies>
       </plugin>
-
-
-      <plugin>
-        <groupId>com.sun.tools.jxc.maven2</groupId>
-        <artifactId>maven-jaxb-schemagen-plugin</artifactId>
-        <!--<version>1.3-dev</version>-->
-        <executions>
-          <execution>
-            <!--<phase>process-sources</phase>-->
-            <phase>package</phase>
-            <configuration>
-              <destdir>${project.build.directory}/schema</destdir>
-              <srcdir>src/main/java/org/apache/camel/rest/model</srcdir>
-              <schemas>
-                <schema>
-                  <namespace>http://activemq.apache.org/camel/schema/rest</namespace>
-                  <file>camel-rest.xsd</file>
-                </schema>
-              </schemas>
-              <!--<verbose>false</verbose>-->
-            </configuration>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
+      
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
@@ -339,4 +311,85 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <!-- The schemagen plugin does not work on IBM's JDK. Lets
+    download the schema instead on that platform. -->
+    <profile>
+      <id>on-ibmjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>IBM Corporation</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
+               <execution>
+                 <id>copy</id>
+                 <phase>generate-resources</phase>
+                 <goals>
+                   <goal>copy</goal>
+                 </goals>
+                 <configuration>
+                   <artifactItems>
+                     <artifactItem>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-rest</artifactId>
+                       <version>${pom.version}</version>
+                       <type>xsd</type>
+                       <overWrite>false</overWrite>
+                       <outputDirectory>${project.build.directory}/schema</outputDirectory>
+                       <destFileName>camel-rest.xsd</destFileName>          
            
+                     </artifactItem>
+                   </artifactItems>
+                 </configuration>
+               </execution>
+             </executions>
+           </plugin>           
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>not-on-ibmjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>!IBM Corporation</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.sun.tools.jxc.maven2</groupId>
+            <artifactId>maven-jaxb-schemagen-plugin</artifactId>
+            <!--<version>1.3-dev</version>-->
+            <executions>
+              <execution>
+                <!--<phase>process-sources</phase>-->
+                <phase>package</phase>
+                <configuration>
+                  <destdir>${project.build.directory}/schema</destdir>
+                  <srcdir>src/main/java/org/apache/camel/rest/model</srcdir>
+                  <schemas>
+                    <schema>
+                      <namespace>http://activemq.apache.org/camel/schema/rest</namespace>
+                      <file>camel-rest.xsd</file>
+                    </schema>
+                  </schemas>
+                  <!--<verbose>false</verbose>-->
+                </configuration>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>      
+        </plugins>
+      </build>
+    </profile>    
+  </profiles>  
 </project>

Modified: activemq/camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=700841&r1=700840&r2=700841&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Wed Oct  1 10:05:30 2008
@@ -250,33 +250,6 @@
           </excludes>
         </configuration>
       </plugin>
-
-
-      <plugin>
-        <groupId>com.sun.tools.jxc.maven2</groupId>
-        <artifactId>maven-jaxb-schemagen-plugin</artifactId>
-        <!--<version>1.3-dev</version>-->
-        <executions>
-          <execution>
-            <phase>process-sources</phase>
-            <configuration>
-              <destdir>${project.build.directory}/schema</destdir>
-              <srcdir>${project.build.directory}/schema-src</srcdir>
-              <schemas>
-                <schema>
-                  <namespace>http://activemq.apache.org/camel/schema/spring</namespace>
-                  <file>camel-spring.xsd</file>
-                </schema>
-              </schemas>
-              <!--<verbose>false</verbose>-->
-            </configuration>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>build-helper-maven-plugin</artifactId>
@@ -298,24 +271,6 @@
           </execution>
         </executions>
       </plugin>
-
-
-<!--
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>exec-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <mainClass>org.apache.camel.spring.Main</mainClass>
-        </configuration>
-      </plugin>
--->
     </plugins>
   </build>
   <profiles>
@@ -349,16 +304,86 @@
         </plugins>
       </build>
     </profile>
+    <!-- The schemagen plugin does not work on IBM's JDK. Lets
+    download the schema instead on that platform. -->
+    <profile>
+      <id>on-ibmjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>IBM Corporation</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+             <groupId>org.apache.maven.plugins</groupId>
+             <artifactId>maven-dependency-plugin</artifactId>
+             <executions>
+               <execution>
+                 <id>unpack</id>
+                 <phase>generate-resources</phase>
+                 <goals>
+                   <goal>unpack</goal>
+                 </goals>
+                 <configuration>
+                   <artifactItems>
+                     <artifactItem>
+                       <groupId>org.apache.camel</groupId>
+                       <artifactId>camel-spring</artifactId>
+                       <version>${pom.version}</version>
+                       <type>jar</type>
+                       <overWrite>false</overWrite>
+                       <outputDirectory>${project.build.directory}/schema</outputDirectory>
+                       <includes>camel-spring.xsd</includes>
+                     </artifactItem>
+                   </artifactItems>
+                 </configuration>
+               </execution>
+             </executions>
+           </plugin>           
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>not-on-ibmjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>!IBM Corporation</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.sun.tools.jxc.maven2</groupId>
+            <artifactId>maven-jaxb-schemagen-plugin</artifactId>
+            <!--<version>1.3-dev</version>-->
+            <executions>
+              <execution>
+                <phase>process-sources</phase>
+                <configuration>
+                  <destdir>${project.build.directory}/schema</destdir>
+                  <srcdir>${project.build.directory}/schema-src</srcdir>
+                  <schemas>
+                    <schema>
+                      <namespace>
+                        http://activemq.apache.org/camel/schema/spring
+                      </namespace>
+                      <file>camel-spring.xsd</file>
+                    </schema>
+                  </schemas>
+                  <!--<verbose>false</verbose>-->
+                </configuration>
+                <goals>
+                  <goal>generate</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>         
+        </plugins>
+      </build>
+    </profile>    
   </profiles>
 
-<!--
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
--->
 </project>

Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=700841&r1=700840&r2=700841&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Wed Oct  1 10:05:30 2008
@@ -69,11 +69,13 @@
     <module>camel-ognl</module>
     <module>camel-osgi</module>
     <module>camel-quartz</module>
+    <module>camel-rest</module>
     <module>camel-rmi</module>
     <!--<module>camel-ruby</module>-->
     <module>camel-saxon</module>
     <module>camel-scala</module>
     <module>camel-script</module>
+    <module>camel-spring</module>
     <module>camel-spring-integration</module>
     <module>camel-sql</module>
     <module>camel-stringtemplate</module>
@@ -86,23 +88,4 @@
     <module>camel-xmpp</module>
     <module>camel-xstream</module>
   </modules>
-
-  <profiles>
-    <!-- The schemagen plugin does not work on IBM's JDK. Lets
-    skip any component builds that use schemagen on that platform. -->
-    <profile>
-      <id>not-on-ibmjdk</id>
-      <activation>
-        <property>
-          <name>java.vendor</name>
-          <value>!IBM Corporation</value>
-        </property>
-      </activation>
-      <modules>
-        <module>camel-rest</module>
-        <module>camel-spring</module>
-      </modules>      
-    </profile>
-  </profiles>
-
 </project>



Mime
View raw message