You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/06/30 02:07:38 UTC

svn commit: r552065 - in /webservices/axis2/trunk/java/modules/jaxbri: maven.xml project.xml

Author: dims
Date: Fri Jun 29 17:07:37 2007
New Revision: 552065

URL: http://svn.apache.org/viewvc?view=rev&rev=552065
Log:
fix build break in m1

Modified:
    webservices/axis2/trunk/java/modules/jaxbri/maven.xml
    webservices/axis2/trunk/java/modules/jaxbri/project.xml

Modified: webservices/axis2/trunk/java/modules/jaxbri/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/maven.xml?view=diff&rev=552065&r1=552064&r2=552065
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/maven.xml Fri Jun 29 17:07:37 2007
@@ -16,4 +16,36 @@
             <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
         </j:if>
     </preGoal>
+    <preGoal name="test:compile">
+                                <!-- Theres got to be a better way to do this -->
+                                <property name="schema.source.dir" value="test-resources/xsd"/>
+                                <property name="wsdl.source.dir" value="test-resources/wsdl"/>
+                                <property name="schema.output.base.dir" value="target/schema"/>
+                                <property name="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
+                                <property name="schema.generated.classes.dir"
+                                          value="${schema.output.base.dir}/classes"/>
+                                <!-- make the dirs -->
+                                <mkdir dir="${schema.output.base.dir}"/>
+                                <mkdir dir="${schema.generated.src.dir}"/>
+                                <mkdir dir="${schema.generated.classes.dir}"/>
+                                <!-- Run JAXB schema compiler with designated schemas -->
+                                <echo>Generating JAX-B classes from XSDs</echo>
+                                <echo>Generating java from soap 11</echo>
+                                <java classname="com.sun.tools.xjc.Driver" fork="true">
+                                    <classpath refid="maven.dependency.classpath"/>
+                                    <classpath location="${compiled.classes.dir}"/>
+                                    <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/DocLitBareService.wsdl"/>
+                                </java>
+
+								<!-- Compile the generated classes -->
+								<ant:echo>Compiling generated schema</ant:echo>
+								<javac destdir="${schema.generated.classes.dir}" srcdir="${schema.generated.src.dir}">
+									<classpath refid="maven.dependency.classpath"></classpath>
+									<classpath location="${compiled.classes.dir}"></classpath>
+								</javac>
+						
+								<ant:path id="schema.generated.classes.dir" location="${schema.generated.classes.dir}"/>
+								<maven:addPath id="maven.dependency.classpath" refid="schema.generated.classes.dir"/>
+    </preGoal>
+
 </project>

Modified: webservices/axis2/trunk/java/modules/jaxbri/project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxbri/project.xml?view=diff&rev=552065&r1=552064&r2=552065
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxbri/project.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxbri/project.xml Fri Jun 29 17:07:37 2007
@@ -27,6 +27,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>${activation.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
             <version>${axiom.version}</version>
@@ -94,6 +99,11 @@
             <version>${jaxbri.version}</version>
         </dependency>
         <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>${xmlunit.version}</version>
+        </dependency>
+        <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <version>${jaxbapi.version}</version>
@@ -129,6 +139,33 @@
                 </includes>
             </resource>
         </resources>
+        <unitTest>
+            <includes>
+                <include>**/*Test.java</include>
+            </includes>
+            <excludes>
+                <exclude>**/*DocLitBareWSDLTest.java</exclude>
+            </excludes>
+
+            <resources>
+                <resource>
+                    <directory>${basedir}/test-resources</directory>
+                </resource>
+                <resource>
+                    <directory>conf</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                    </includes>
+                </resource>
+                <resource>
+                    <directory>src</directory>
+                    <includes>
+                        <include>**/*.properties</include>
+                        <include>**/*.xml</include>
+                    </includes>
+                </resource>
+            </resources>
+        </unitTest>
     </build>
     <reports/>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org