camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r824298 - in /camel/trunk/components: camel-blueprint/pom.xml camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java camel-spring/pom.xml
Date Mon, 12 Oct 2009 11:34:10 GMT
Author: ningjiang
Date: Mon Oct 12 11:34:10 2009
New Revision: 824298

URL: http://svn.apache.org/viewvc?rev=824298&view=rev
Log:
Try to fix the camel-spring, camel-buleprint build issue on Sun JDK

Modified:
    camel/trunk/components/camel-blueprint/pom.xml
    camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
    camel/trunk/components/camel-spring/pom.xml

Modified: camel/trunk/components/camel-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-blueprint/pom.xml?rev=824298&r1=824297&r2=824298&view=diff
==============================================================================
--- camel/trunk/components/camel-blueprint/pom.xml (original)
+++ camel/trunk/components/camel-blueprint/pom.xml Mon Oct 12 11:34:10 2009
@@ -1,401 +1,410 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.apache.camel</groupId>
-        <artifactId>camel-parent</artifactId>
-        <version>2.1-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>camel-blueprint</artifactId>
-    <name>Camel :: Blueprint</name>
-    <description>Camel OSGi Blueprint support</description>
-    <packaging>bundle</packaging>
-
-    <properties>
-        <camel.osgi.import>
-            !org.apache.camel.blueprint.*,
-            !javax.xml.bind.annotation.adapters,
-            org.apache.camel.*;${camel.osgi.import.strict.version},
-            *
-        </camel.osgi.import>
-        <camel.osgi.export>
-            org.apache.camel.blueprint*;${camel.osgi.version}
-        </camel.osgi.export>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>aries-blueprint</artifactId>
-            <version>1.0.0-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <!-- for testing -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-core</artifactId>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <repositories>
-        <!-- for maven jaxb plugin -->
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1</url>
-            <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
-            <layout>legacy</layout>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>open.iona.m2</id>
-            <name>IONA Open Source Community Release Repository</name>
-            <url>http://repo.open.iona.com/maven2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>target/schema</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-
-        <plugins>
-
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <childDelegation>false</childDelegation>
-                    <useFile>true</useFile>
-                    <forkMode>pertest</forkMode>
-                    <includes>
-                        <include>**/*Test.java</include>
-                    </includes>
-                    <excludes>
-                        <!-- TODO FIXME ASAP -->
-                        <exclude>**/XXXTest.*</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>package</id>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <echo>Deleting unwanted resources from the test-jar</echo>
-                                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true"/>
-                                <delete file="${project.build.directory}/test-classes/META-INF/spring/*"
verbose="true"/>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <!-- generate the attached tests jar -->
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>test-jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <!-- TODO: this doesn't work - if ever we can figure out the maven
ninja to get it working -->
-                    <!-- TODO: we can zap the Ant package phase stuff above -->
-                    <excludes>
-                        <exclude>**/*/log4j.properties</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/schema/camel-blueprint.xsd</file>
-                                    <type>xsd</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                                <groupId>org.apache.camel</groupId>
-                                <artifactId>camel-blueprint</artifactId>
-                                <version>${pom.version}</version>
-                                <type>jar</type>
-                                <overWrite>false</overWrite>
-                                <outputDirectory>${project.build.directory}/schema</outputDirectory>
-                                <includes>camel-blueprint.xsd</includes>
-                            </artifactItem>
-                        </artifactItems>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <links>
-                                <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                                <link>http://java.sun.com/javaee/5/docs/api/</link>
-                            </links>
-                            <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
-                            <linksource>true</linksource>
-                            <source>1.5</source>
-                        </configuration>
-                    </plugin>
-                </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>
-                  <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"/>
-                                  <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>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <links>
-                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
-                        <link>http://java.sun.com/javaee/5/docs/api/</link>
-                        <link>http://camel.apache.org/maven/camel-core/apidocs/</link>
-                    </links>
-                    <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
-                    <linksource>true</linksource>
-                    <maxmemory>256m</maxmemory>
-                    <source>1.5</source>
-
-                    <groups>
-                        <group>
-                            <title>Camel Blueprint Classes</title>
-                            <packages>org.apache.camel.blueprint</packages>
-                        </group>
-                    </groups>
-                </configuration>
-            </plugin>
-        </plugins>
-    </reporting>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-parent</artifactId>
+        <version>2.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>camel-blueprint</artifactId>
+    <name>Camel :: Blueprint</name>
+    <description>Camel OSGi Blueprint support</description>
+    <packaging>bundle</packaging>
+
+    <properties>
+        <camel.osgi.import>
+            !org.apache.camel.blueprint.*,
+            !javax.xml.bind.annotation.adapters,
+            org.apache.camel.*;${camel.osgi.import.strict.version},
+            *
+        </camel.osgi.import>
+        <camel.osgi.export>
+            org.apache.camel.blueprint*;${camel.osgi.version}
+        </camel.osgi.export>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>aries-blueprint</artifactId>
+            <version>1.0.0-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <!-- for testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <repositories>
+        <!-- for maven jaxb plugin -->
+        <repository>
+            <id>java.net</id>
+            <name>java.net Maven Repository</name>
+            <url>http://download.java.net/maven/1</url>
+            <!--<url>https://maven-repository.dev.java.net/nonav/repository</url>-->
+            <layout>legacy</layout>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>open.iona.m2</id>
+            <name>IONA Open Source Community Release Repository</name>
+            <url>http://repo.open.iona.com/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>target/schema</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <includes>
+                    <include>**/*</include>
+                </includes>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <childDelegation>false</childDelegation>
+                    <useFile>true</useFile>
+                    <forkMode>pertest</forkMode>
+                    <includes>
+                        <include>**/*Test.java</include>
+                    </includes>
+                    <excludes>
+                        <!-- TODO FIXME ASAP -->
+                        <exclude>**/XXXTest.*</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>package</id>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <echo>Deleting unwanted resources from the test-jar</echo>
+                                <delete file="${project.build.directory}/test-classes/log4j.properties"
verbose="true"/>
+                                <delete file="${project.build.directory}/test-classes/META-INF/spring/*"
verbose="true"/>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- generate the attached tests jar -->
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <!-- TODO: this doesn't work - if ever we can figure out the maven
ninja to get it working -->
+                    <!-- TODO: we can zap the Ant package phase stuff above -->
+                    <excludes>
+                        <exclude>**/*/log4j.properties</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-artifacts</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>attach-artifact</goal>
+                        </goals>
+                        <configuration>
+                            <artifacts>
+                                <artifact>
+                                    <file>${project.build.directory}/schema/camel-blueprint.xsd</file>
+                                    <type>xsd</type>
+                                </artifact>
+                            </artifacts>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>org.apache.camel</groupId>
+                                <artifactId>camel-blueprint</artifactId>
+                                <version>${pom.version}</version>
+                                <type>jar</type>
+                                <overWrite>false</overWrite>
+                                <outputDirectory>${project.build.directory}/schema</outputDirectory>
+                                <includes>camel-blueprint.xsd</includes>
+                            </artifactItem>
+                        </artifactItems>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <links>
+                                <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                                <link>http://java.sun.com/javaee/5/docs/api/</link>
+                            </links>
+                            <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
+                            <linksource>true</linksource>
+                            <source>1.5</source>
+                        </configuration>
+                    </plugin>
+                </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>
+                  <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"/>
+                                  <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>
+                 <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>
+            <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>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+                        <link>http://java.sun.com/javaee/5/docs/api/</link>
+                        <link>http://camel.apache.org/maven/camel-core/apidocs/</link>
+                    </links>
+                    <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
+                    <linksource>true</linksource>
+                    <maxmemory>256m</maxmemory>
+                    <source>1.5</source>
+
+                    <groups>
+                        <group>
+                            <title>Camel Blueprint Classes</title>
+                            <packages>org.apache.camel.blueprint</packages>
+                        </group>
+                    </groups>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
+
+</project>

Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java?rev=824298&r1=824297&r2=824298&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
(original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/BeanWithXQueryInjectionTest.java
Mon Oct 12 11:34:10 2009
@@ -20,7 +20,6 @@
 
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.xquery.XQuery;
-import org.apache.camel.processor.BeanRouteTest;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.jndi.JndiContext;
 import org.apache.commons.logging.Log;

Modified: camel/trunk/components/camel-spring/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/pom.xml?rev=824298&r1=824297&r2=824298&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/pom.xml (original)
+++ camel/trunk/components/camel-spring/pom.xml Mon Oct 12 11:34:10 2009
@@ -300,6 +300,7 @@
 
          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>
@@ -355,10 +356,18 @@
                       </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>



Mime
View raw message