You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/10/12 14:21:17 UTC
svn commit: r824314 - in /camel/branches/camel-1.x: ./
components/camel-blueprint/pom.xml
Author: ningjiang
Date: Mon Oct 12 12:21:17 2009
New Revision: 824314
URL: http://svn.apache.org/viewvc?rev=824314&view=rev
Log:
Merged revisions 823177 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r823177 | gnodet | 2009-10-08 21:48:53 +0800 (Thu, 08 Oct 2009) | 1 line
CAMEL-2022: Try to fix builds on non sun jdk
........
Modified:
camel/branches/camel-1.x/ (props changed)
camel/branches/camel-1.x/components/camel-blueprint/pom.xml
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 12 12:21:17 2009
@@ -1 +1 @@
-/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823575,824218
+/camel/trunk:736980,739733,739904,740251,740295,740306,740596,740663,741848,742231,742705,742739,742854,742856,742898,742906,743613,743762,743773,743920,743959-743960,744123,745105,745367,745541,745751,745826,745978,746269,746872,746895,746962,747258,747678-747704,748392,748436,748821,749563-749564,749574,749628-749629,749936,749956,750017,750334,750396,750761,750796,752068,752117,752418,752751-752755,752764-752773,752956,753087,753101,753175,755136,755487,756313,756348,756870,756939,757636,757693,757743,757865,758539,758563,758600,758617,758692,758990,759362,759453,759887,759931,760003,760890,760909,760937,761194,761536,761583,761607,762047,762633,762650,762935,763095,763484,763551,765154,765686,765729,765743,765824,766016,766289,766584,766588,766590,766602,766673,767403,767824,768342,769239,769346,769368,769434,770172,770906,771303,773193,773446,773781,774192,774383,774658-774659,776198,776289,776504,776975,778102,778689-778701,779121,779143,779489,781314-781349,781775,781
923,781974,781993,782557,782594,782681,782886,782918-782923,783204,783248,783363,783639,783704,785564,785584,785599,787206,787581,787598,787605,787928,788393,789121,789703,790560,790936,791379,791476,791767,792038,792381,792398,792899,793359,793518,793547-793555,793862,793935,794237,794368,794550,794967,795790,798027,798052,798063,798489,798864,799252,800340,800785,800797,801084,801196,801960,802307,802478,803559,807476,810751,812937,814493,816105,817654,818063,818182-818354,818744,818747,819475,819483,819956,820152,820168,821272,821290,822655,823013,823018,823031,823102,823177,823575,824218
Propchange: camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-1.x/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-blueprint/pom.xml?rev=824314&r1=824313&r2=824314&view=diff
==============================================================================
--- camel/branches/camel-1.x/components/camel-blueprint/pom.xml (original)
+++ camel/branches/camel-1.x/components/camel-blueprint/pom.xml Mon Oct 12 12:21:17 2009
@@ -141,46 +141,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>process-sources</id>
- <phase>process-sources</phase>
- <configuration>
- <tasks>
- <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath"/>
-
- <echo>Copying to code together for the XSD generation</echo>
- <mkdir dir="${project.build.directory}/schema-src"/>
- <mkdir dir="${project.build.directory}/schema"/>
- <copy todir="${project.build.directory}/schema-src">
- <fileset dir="${basedir}/src/main/java">
- <include name="org/apache/camel/blueprint/Camel*.java"/>
- <include name="org/apache/camel/blueprint/Endpoint*.java"/>
- <include name="org/apache/camel/blueprint/package-info.java"/>
- </fileset>
- <fileset dir="${basedir}/../../camel-core/src/main/java">
- <include name="org/apache/camel/model/**/*.java"/>
- <include name="org/apache/camel/ExchangePattern.java"/>
- <include name="org/apache/camel/LoggingLevel.java"/>
- <include name="org/apache/camel/ManagementStatisticsLevel.java"/>
- <include name="**/package-info.java"/>
- </fileset>
- </copy>
-
- <echo>Generating XSD schema</echo>
- <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
- <schema namespace="http://activemq.apache.org/camel/schema/spring" file="camel-blueprint.xsd"/>
- <classpath refid="maven.compile.classpath"/>
- </schemagen>
- <replace file="${project.build.directory}/schema/camel-blueprint.xsd"
- token="http://activemq.apache.org/camel/schema/spring" value="http://camel.apache.org/schema/blueprint"/>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
<id>package</id>
<phase>package</phase>
<configuration>
@@ -292,6 +252,122 @@
</plugins>
</build>
</profile>
+
+ <!-- The next three profiles are used to bypass the schemagen plugin on HP and IBM JDKs.
+
+ TODO: Whenever Maven supports profile activations based on multiple properties, we
+ should combine the on-ibmjdk and on-hpjdk profiles as they do exactly the same thing. -->
+ <profile>
+ <id>enable-schemagen</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>process-sources</id>
+ <phase>process-sources</phase>
+ <configuration>
+ <tasks>
+ <taskdef name="schemagen" classname="com.sun.tools.jxc.SchemaGenTask" classpathref="maven.plugin.classpath"/>
+
+ <echo>Copying to code together for the XSD generation</echo>
+ <mkdir dir="${project.build.directory}/schema-src"/>
+ <mkdir dir="${project.build.directory}/schema"/>
+ <copy todir="${project.build.directory}/schema-src">
+ <fileset dir="${basedir}/src/main/java">
+ <include name="org/apache/camel/blueprint/Camel*.java"/>
+ <include name="org/apache/camel/blueprint/package-info.java"/>
+ </fileset>
+ <fileset dir="${basedir}/../../camel-core/src/main/java">
+ <include name="org/apache/camel/model/**/*.java"/>
+ <include name="org/apache/camel/ExchangePattern.java"/>
+ <include name="org/apache/camel/LoggingLevel.java"/>
+ <include name="org/apache/camel/ManagementStatisticsLevel.java"/>
+ <include name="**/package-info.java"/>
+ </fileset>
+ </copy>
+
+ <echo>Generating XSD schema</echo>
+ <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
+ <schema namespace="http://camel.apache.org/schema/spring" file="camel-blueprint.xsd"/>
+ <classpath refid="maven.compile.classpath"/>
+ </schemagen>
+ <replace file="${project.build.directory}/schema/camel-blueprint.xsd"
+ token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/blueprint"/>
+
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <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-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </execution>
+
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>on-hpjdk</id>
+ <activation>
+ <property>
+ <name>java.vendor</name>
+ <value>Hewlett-Packard Co.</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<reporting>