Permalink
Browse files

CAMEL-939 - Get the camel-spring and camel-rest tests running on AIX.

git-svn-id: https://svn.apache.org/repos/asf/activemq/camel/trunk@700841 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 97722db commit a0ec5b324d924b362ff12a9365f84586940bb719 @janstey janstey committed Oct 1, 2008
Showing with 164 additions and 103 deletions.
  1. +82 −29 components/camel-rest/pom.xml
  2. +80 −55 components/camel-spring/pom.xml
  3. +2 −19 components/pom.xml
@@ -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>
@@ -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>
View
@@ -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>

0 comments on commit a0ec5b3

Please sign in to comment.