svn commit: r488888 - in /webservices/axis2/trunk/java/modules: jaxws/test/org/apache/axis2/jaxws/description/ metadata/ metadata/test-resources/ metadata/test-resources/wsdl/ metadata/test/org/apache/axis2/jaxws/description/ metadata/test/org/apache/w...

[di...@apache.org]

Author: dims
Date: Tue Dec 19 18:19:27 2006
New Revision: 488888

URL: http://svn.apache.org/viewvc?view=rev&rev=488888
Log:
move AnnotationServiceImplDescriptionTests from jaxws to metadata

Added:
    webservices/axis2/trunk/java/modules/metadata/test-resources/
    webservices/axis2/trunk/java/modules/metadata/test-resources/wsdl/
    webservices/axis2/trunk/java/modules/metadata/test-resources/wsdl/ProxyDocLitWrapped.wsdl
      - copied unchanged from r488498, webservices/axis2/trunk/java/modules/jaxws/test-resources/wsdl/ProxyDocLitWrapped.wsdl
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
      - copied unchanged from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitWrappedImplWithSEI.java
      - copied unchanged from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DocLitWrappedImplWithSEI.java
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/axis2/jaxws/description/DocLitWrappedProxy.java
      - copied unchanged from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/DocLitWrappedProxy.java
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/ws/
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/ws/axis2/
    webservices/axis2/trunk/java/modules/metadata/test/org/apache/ws/axis2/tests/
      - copied from r488498, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/ws/axis2/tests/
Removed:
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/description/AnnotationServiceImplDescriptionTests.java
Modified:
    webservices/axis2/trunk/java/modules/metadata/maven.xml

Modified: webservices/axis2/trunk/java/modules/metadata/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/metadata/maven.xml?view=diff&rev=488888&r1=488887&r2=488888
==============================================================================
--- webservices/axis2/trunk/java/modules/metadata/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/metadata/maven.xml Tue Dec 19 18:19:27 2006
@@ -16,7 +16,46 @@
             <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
         </j:if>
     </preGoal>
-	
+
+	<!-- run the JAXB schema compiler -->
+    <preGoal name="test:compile">
+
+        <j:set var="compiled.classes.dir" value="target/test-classes"/>
+        
+    	<!-- Theres got to be a better way to do this -->
+        <j:set var="schema.source.dir" value="test-resources/xsd"/>
+    	<j:set var="wsdl.source.dir" value="test-resources/wsdl"/>
+        <j:set var="schema.output.base.dir" value="target/schema"/>
+        <j:set var="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
+        <j:set var="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 -->
+        <ant:echo>Generating JAX-B classes from XSDs</ant:echo>    
+
+    	<ant:echo>Generating java from ProxyDocLitWrapped.wsdl</ant:echo>
+    	<java classname="com.sun.tools.xjc.Driver" fork="true"> 
+    		<jvmarg line="${maven.junit.jvmargs2}"/>
+    	    <classpath refid="maven.dependency.classpath"/>
+    	    <classpath location="${compiled.classes.dir}"/>
+    	    <arg line="-d ${schema.generated.src.dir} -quiet -p org.test.proxy.doclitwrapped -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitWrapped.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>
+
 	    <postGoal name="java:jar-resources">
 	      <tstamp>
 	        <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en"/>



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