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/13 09:33:18 UTC

svn commit: r824624 - in /camel/trunk: components/camel-spring/pom.xml parent/pom.xml

Author: ningjiang
Date: Tue Oct 13 07:33:18 2009
New Revision: 824624

URL: http://svn.apache.org/viewvc?rev=824624&view=rev
Log:
Try to fix the camel-spring and camel-blueprint ubuild error on SUN jdk

Modified:
    camel/trunk/components/camel-spring/pom.xml
    camel/trunk/parent/pom.xml

Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=824624&r1=824623&r2=824624&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Tue Oct 13 07:33:18 2009
@@ -360,77 +360,7 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>enable-schemagen-sunjdk</id>
-      <activation>
-        <property>
-          <name>java.vendor</name>
-          <value>Sun Microsystems Inc.</value>
-        </property>
-      </activation>
 
-      <build>
-        <plugins>
-          <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-antrun-plugin</artifactId>
-              <inherited>true</inherited>
-              <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" />
-                              <copy todir="${project.build.directory}/schema-src">
-                                <fileset dir="${basedir}/src/main/java">
-                                  <include name="org/apache/camel/spring/Camel*.java" />
-                                  <include name="org/apache/camel/spring/Endpoint*.java" />
-                                  <include name="org/apache/camel/spring/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="org/apache/camel/package-info.java" />
-                                </fileset>
-                              </copy>
-
-                              <echo>Generating XSD schema</echo>
-                              <mkdir dir="${project.build.directory}/schema" />
-                              <schemagen srcdir="${project.build.directory}/schema-src" destdir="${project.build.directory}/schema">
-                                  <schema namespace="http://camel.apache.org/schema/spring" file="camel-spring.xsd"/>
-                                  <classpath refid="maven.compile.classpath"/>
-                              </schemagen>
-                              <copy file="${project.build.directory}/schema/camel-spring.xsd"
-                                    tofile="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd"/>
-                              <replace file="${project.build.directory}/schema/camel-spring-v${camel.schema.version}.xsd"
-                                       token="http://camel.apache.org/schema/spring" value="http://camel.apache.org/schema/spring/v${camel.schema.version}"/>
-
-                          </tasks>
-                      </configuration>
-                      <goals>
-                          <goal>run</goal>
-                      </goals>
-                  </execution>
-              </executions>
-              <dependencies>
-                <dependency>
-                  <groupId>com.sun</groupId>
-                  <artifactId>tools</artifactId>
-                  <version>1.5.0</version>
-                  <scope>system</scope>
-                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
-                </dependency>
-              </dependencies>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>on-ibmjdk</id>
       <activation>

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=824624&r1=824623&r2=824624&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Oct 13 07:33:18 2009
@@ -1224,6 +1224,35 @@
             </plugins>
         </build>
     </profile>
+    <profile>
+      <id>on-sunjdk</id>
+      <activation>
+        <property>
+          <name>java.vendor</name>
+          <value>Sun Microsystems Inc.</value>
+        </property>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-antrun-plugin</artifactId>
+              <inherited>true</inherited>
+              <dependencies>
+                <dependency>
+                  <groupId>com.sun</groupId>
+                  <artifactId>tools</artifactId>
+                  <version>1.5.0</version>
+                  <scope>system</scope>
+                  <systemPath>${java.home}/../lib/tools.jar</systemPath>
+                </dependency>
+              </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+      
   </profiles>
 
 </project>