From fd8233ae4adef76248e3902bf6557c89cbfa455c Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 15 Feb 2007 23:23:40 +0000
Subject: [PATCH] Fixing build.

---
 oxm-tiger/pom.xml    |  25 ++++++++--
 oxm/build-maven2.xml |  24 ++++------
 oxm/pom.xml          | 106 ++++---------------------------------------
 3 files changed, 41 insertions(+), 114 deletions(-)

diff --git a/oxm-tiger/pom.xml b/oxm-tiger/pom.xml
index f23450f8..a3126ccb 100644
--- a/oxm-tiger/pom.xml
+++ b/oxm-tiger/pom.xml
@@ -1,4 +1,5 @@
-<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">
+<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">
     <parent>
         <artifactId>spring-ws</artifactId>
         <groupId>org.springframework.ws</groupId>
@@ -22,11 +23,12 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
+                        <id>generate-jaxb2-sources</id>
                         <phase>generate-test-sources</phase>
                         <configuration>
                             <tasks>
                                 <ant antfile="${basedir}/build-maven2.xml" inheritRefs="true">
-                                    <target name="generate-test-sources" />
+                                    <target name="generate-test-sources"/>
                                 </ant>
                             </tasks>
                             <testSourceRoot>${project.build.directory}/generated-sources/test/java</testSourceRoot>
@@ -44,6 +46,24 @@
         <dependency>
             <groupId>org.springframework.ws</groupId>
             <artifactId>spring-oxm</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-libs</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.sun.msv.datatype.xsd</groupId>
+                    <artifactId>xsdlib</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- XML handling dependencies -->
         <dependency>
@@ -70,6 +90,5 @@
             <version>2.0.3</version>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 </project>
diff --git a/oxm/build-maven2.xml b/oxm/build-maven2.xml
index 759663b5..e9480c61 100644
--- a/oxm/build-maven2.xml
+++ b/oxm/build-maven2.xml
@@ -17,35 +17,29 @@
     </target>
 
     <target name="generate-test-jaxb" depends="generate-test-init">
-        <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask"
-                 classpathref="maven.plugin.classpath"/>
-        <xjc target="${generate.target.directory}"
-             package="org.springframework.oxm.jaxb1"
-             schema="${schema}">
+        <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask" classpathref="maven.test.classpath"/>
+        <xjc target="${generate.target.directory}" package="org.springframework.oxm.jaxb1" schema="${schema}">
             <produces dir="${generate.target.directory}" includes="**/jaxb1/**/*.java"/>
         </xjc>
     </target>
 
     <target name="generate-test-xmlbeans">
-        <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="maven.plugin.classpath"/>
-        <xmlbean schema="${schema}" classgendir="${basedir}/target/test-classes" classpathref="maven.plugin.classpath"/>
+        <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean" classpathref="maven.test.classpath"/>
+        <xmlbean schema="${schema}" classgendir="${basedir}/target/test-classes" classpathref="maven.test.classpath"/>
     </target>
 
     <target name="generate-test-castor" depends="generate-test-init">
         <taskdef name="castor-srcgen" classname="org.exolab.castor.tools.ant.taskdefs.CastorSourceGenTask"
-                 classpathref="maven.plugin.classpath"/>
-        <castor-srcgen types="j2" warnings="false" file="${schema}"
-                       todir="${generate.target.directory}" package="org.springframework.oxm.castor"/>
+                 classpathref="maven.test.classpath"/>
+        <castor-srcgen types="j2" warnings="false" file="${schema}" todir="${generate.target.directory}"
+                       package="org.springframework.oxm.castor"/>
     </target>
 
     <target name="test-compile" depends="test-compile-jibx"/>
 
     <target name="test-compile-jibx">
-        <taskdef name="jibx-bind"
-                 classname="org.jibx.binding.ant.CompileTask"
-                 classpathref="maven.test.classpath"/>
-        <jibx-bind load="true"
-                   binding="${basedir}/src/test/resources/org/springframework/oxm/jibx/binding.xml">
+        <taskdef name="jibx-bind" classname="org.jibx.binding.ant.CompileTask" classpathref="maven.test.classpath"/>
+        <jibx-bind load="true" binding="${basedir}/src/test/resources/org/springframework/oxm/jibx/binding.xml">
             <classpathset dir="${basedir}/target/test-classes">
                 <include name="**/jibx/**/*"/>
             </classpathset>
diff --git a/oxm/pom.xml b/oxm/pom.xml
index 2624bc8f..5bc6560a 100644
--- a/oxm/pom.xml
+++ b/oxm/pom.xml
@@ -55,102 +55,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <dependencies>
-                    <!-- JAXB dependencies -->
-                    <dependency>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                        <version>1.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-xjc</artifactId>
-                        <version>1.0.6</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-impl</artifactId>
-                        <version>1.0.6</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.xml.bind</groupId>
-                        <artifactId>jaxb-libs</artifactId>
-                        <version>1.0.6</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.sun.msv.datatype.xsd</groupId>
-                        <artifactId>xsdlib</artifactId>
-                        <version>20060615</version>
-                    </dependency>
-                    <!-- XMLBeans dependencies -->
-                    <dependency>
-                        <groupId>xmlbeans</groupId>
-                        <artifactId>xbean</artifactId>
-                        <version>2.1.0</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>stax</groupId>
-                        <artifactId>stax-api</artifactId>
-                        <version>1.0.1</version>
-                    </dependency>
-                    <!-- Castor dependencies -->
-                    <dependency>
-                        <groupId>org.codehaus.castor</groupId>
-                        <artifactId>castor</artifactId>
-                        <version>1.0.5</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>adaptx</groupId>
-                                <artifactId>adaptx</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>ant</groupId>
-                                <artifactId>ant</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>cglib</groupId>
-                                <artifactId>cglib-full</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>com.cenqua.clover</groupId>
-                                <artifactId>clover</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>oro</groupId>
-                                <artifactId>oro</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>jakarta-regexp</groupId>
-                                <artifactId>jakarta-regexp</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.servlet</groupId>
-                                <artifactId>servlet-api</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>javax.transaction</groupId>
-                                <artifactId>jta</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>ldapsdk</groupId>
-                                <artifactId>ldapsdk</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>log4j</groupId>
-                                <artifactId>log4j</artifactId>
-                            </exclusion>
-                            <exclusion>
-                                <groupId>xerces</groupId>
-                                <artifactId>xerces</artifactId>
-                            </exclusion>
-                        </exclusions>
-                    </dependency>
-                    <dependency>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                        <version>2.8.1</version>
-                    </dependency>
-                </dependencies>
             </plugin>
         </plugins>
     </build>
@@ -238,21 +142,31 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>1.0</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>1.0.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-libs</artifactId>
+            <version>1.0.6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-xjc</artifactId>
+            <version>1.0.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.msv.datatype.xsd</groupId>
             <artifactId>xsdlib</artifactId>
+            <version>20060615</version>
             <scope>test</scope>
         </dependency>
         <!-- XMLBeans -->