axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sc...@apache.org
Subject svn commit: r422206 - in /webservices/axis2/trunk/java/modules/jaxws: ./ test-resources/xsd/ test/client/ test/org/apache/axis2/jaxws/ test/org/apache/axis2/jaxws/message/
Date Sat, 15 Jul 2006 12:18:44 GMT
Author: scheu
Date: Sat Jul 15 05:18:44 2006
New Revision: 422206

URL: http://svn.apache.org/viewvc?rev=422206&view=rev
Log:
JIRA Issue AXIS2-896
Contributors: Lizet Ernand and Rich Scheuerle

Added:
    webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/
    webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/echo.xsd
Removed:
    webservices/axis2/trunk/java/modules/jaxws/test/client/EchoString.java
    webservices/axis2/trunk/java/modules/jaxws/test/client/EchoStringResponse.java
    webservices/axis2/trunk/java/modules/jaxws/test/client/ObjectFactory.java
    webservices/axis2/trunk/java/modules/jaxws/test/client/package-info.java
Modified:
    webservices/axis2/trunk/java/modules/jaxws/maven.xml
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBCallbackHandler.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBDispatch.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
    webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java

Modified: webservices/axis2/trunk/java/modules/jaxws/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/maven.xml?rev=422206&r1=422205&r2=422206&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/jaxws/maven.xml Sat Jul 15 05:18:44 2006
@@ -1,222 +1,260 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
-
-<project default="jar"
-         xmlns:j="jelly:core" 
-         xmlns:u="jelly:util"
-         xmlns:maven="jelly:maven"
-         xmlns:util="jelly:util"
-         xmlns:deploy="deploy"
-         xmlns:ant="jelly:ant">
-
-    <preGoal name="itest:compile">
-        <u:file var="file" name="${maven.itest.src}"/>
-        <j:if test="${!file.exists()}">
-            <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
-        </j:if>
-    </preGoal>
-	
-	<preGoal name="test:test">
-		<ant:copy toDir="target/test-classes/services/EchoService/">
-			<ant:fileset dir="target/test-classes">
-				<ant:include name="server/**"/>
-			</ant:fileset>
-			<ant:fileset dir="test/server">
-				<ant:exclude name="**/*.java"/>
-			</ant:fileset>
-		</ant:copy>
-        <!-- ================================================================ -->
-        <!--- Provider endpoint Service Samples -->
-        <!-- ================================================================ -->
-		<ant:copy toDir="target/test-classes/services/StringProviderService/">
-			<ant:fileset dir="target/test-classes">
-				<ant:include name="org/apache/axis2/jaxws/provider/string/**"/>
-			</ant:fileset>
-			<ant:fileset dir="test/org/apache/axis2/jaxws/provider/string">
-                <ant:include name="META-INF/**"/>
-			</ant:fileset>
-			<ant:fileset dir="target/classes">
-                <ant:include name="org/apache/axis2/jaxws/server/**"/>
-			</ant:fileset>
-		</ant:copy>
-		<ant:copy toDir="target/test-classes/services/SourceProviderService/">
-			<ant:fileset dir="target/test-classes">
-				<ant:include name="org/apache/axis2/jaxws/provider/source/**"/>
-			</ant:fileset>
-			<ant:fileset dir="test/org/apache/axis2/jaxws/provider/source">
-                <ant:include name="META-INF/**"/>
-			</ant:fileset>
-			<ant:fileset dir="target/classes">
-                <ant:include name="org/apache/axis2/jaxws/server/**"/>
-			</ant:fileset>
-		</ant:copy>
-	</preGoal>
-
-    <!-- Create the API and Impl jars --> 
-    <postGoal name="jar">
-        <jar destfile="target/jaxws-api-${jaxws.version}.jar">
-            <ant:fileset dir="target/classes">
-            	<ant:exclude name="com/ibm/webservices/**"/>
-            </ant:fileset>
-        </jar>
-    	<jar destfile="target/jaxws-impl-${jaxws.version}.jar">
-    	    <ant:fileset dir="target/classes">
-                <ant:exclude name="javax/**"/>
-            </ant:fileset>
-    	</jar>
-        <ant:copy toDir="${maven.repo.local}/jaxws/jars">
-            <ant:fileset file="target/jaxws-impl-${jaxws.version}.jar"/>
-        	<ant:fileset file="target/jaxws-api-${jaxws.version}.jar"/>
-        </ant:copy>
-    </postGoal>
-
-    <goal name="jar">
-        <attainGoal name="jar:install"/>
-
-    </goal>
-
-    <goal name="release" prereqs="dist-bin,dist-src">
-
-
-    </goal>
-
-    <goal name="dist-bin" prereqs="jar">
-
-        <ant:echo>+----------------------------------------------</ant:echo>
-        <ant:echo>| Creating: JAXWS Binary Distribution</ant:echo>
-        <ant:echo>+----------------------------------------------</ant:echo>
-
-
-        <property name="dist" value="target/dist/temp"/>
-
-        <mkdir dir="${dist}"/>
-        <mkdir dir="${dist}/apidocs"/>
-        <mkdir dir="${dist}/build"/>
-        <!--<mkdir dir="${dist}/docs"/>-->
-        <mkdir dir="${dist}/lib"/>
-
-        <!--copy dependent jars-->
-        <maven:reactor basedir="${basedir}"
-                       postProcessing="true"
-                       includes="project.xml"
-                       banner="Executing (${goals}):"
-                       ignoreFailures="false"/>
-        <j:forEach var="x" items="${reactorProjects}">
-            <ant:echo message="Copying ${x} to ${dist}"/>
-            <deploy:copy-deps todir="${dist}/lib"
-                              projectDescriptor="${x.getFile()}"/>
-        </j:forEach>
-        <ant:delete file="${dist}/lib/xmlunit-${xmlunit.version}.jar"/>
-
-        <!--Add the licenses of jars-->
-        <ant:copy toDir="${dist}/lib">
-            <ant:fileset dir="legal"/>
-        </ant:copy>
-
-        <!--add api docs-->
-
-        <ant:javadoc packagenames="org.apache.jaxws.*"
-                     defaultexcludes="yes"
-                     destdir="${dist}/apidocs"
-                     author="true"
-                     breakiterator="true"
-                     version="true"
-                     use="true"
-                     windowtitle="JAXWS API">
-            <ant:arg
-                    line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
-            <ant:sourcepath>
-                <ant:pathelement location="src"/>
-            </ant:sourcepath>
-            <ant:classpath>
-                <ant:fileset dir="${dist}/lib">
-                    <ant:include name="*.jar"/>
-                </ant:fileset>
-            </ant:classpath>
-        </ant:javadoc>
-
-        <!--add jars-->
-        <ant:copy toDir="${dist}/build">
-            <ant:fileset file="target/jaxws-api-${jaxws.version}.jar"/>
-            <ant:fileset file="target/jaxws-impl-${jaxws.version}.jar"/>
-        </ant:copy>
-
-        <!--add documents-->
-        <ant:copy toDir="${dist}/docs">
-            <ant:fileset dir="xdocs">
-                <ant:exclude name="**/.svn/**"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <!--copy release notes, etc-->
-        <ant:copy toDir="${dist}">
-            <ant:fileset file="RELEASE-NOTE.txt"/>
-            <ant:fileset file="README.txt"/>
-            <ant:fileset file="NOTICE.txt"/>
-            <ant:fileset file="LICENSE.txt"/>
-        </ant:copy>
-
-
-        <!--create the zip-->
-        <ant:zip file="target/dist/jaxws-${jaxws.version}-bin.zip">
-            <ant:fileset dir="${dist}/"/>
-        </ant:zip>
-
-        <ant:delete dir="${dist}"/>
-
-    </goal>
-
-    <goal name="dist-src" prereqs="jar">
-
-        <ant:echo>+----------------------------------------------</ant:echo>
-        <ant:echo>| Creating: JAXWS Source Distribution</ant:echo>
-        <ant:echo>+----------------------------------------------</ant:echo>
-
-        <ant:property name="${dist}" value="target/dist/temp"/>
-
-        <ant:copy toDir="${dist}">
-            <ant:fileset dir=".">
-                <ant:exclude name="**/.svn/**"/>
-                <ant:include name="**/src/**"/>
-                <ant:include name="**/test/**"/>
-            </ant:fileset>
-        </ant:copy>
-
-        <!-- Copy the master maven files for the standard src distro -->
-        <ant:copy toDir="${dist}">
-            <ant:fileset file="maven.xml"/>
-            <ant:fileset file="project.xml"/>
-            <ant:fileset file="project.properties"/>
-            <ant:fileset file="RELEASE-NOTE.txt"/>
-            <ant:fileset file="NOTICE.txt"/>
-            <ant:fileset file="LICENSE.txt"/>
-        </ant:copy>
-
-        <ant:zip file="target/dist/jaxws-${jaxws.version}-src.zip">
-            <ant:fileset dir="${dist}/"/>
-        </ant:zip>
-        <ant:delete dir="${dist}"/>
-    </goal>
-
-    <goal name="javadocs">
-
-        <mkdir dir="target/apidocs"/>
-
-        <ant:javadoc packagenames="org.apache.jaxws.*"
-                     defaultexcludes="yes"
-                     destdir="target/apidocs"
-                     author="true"
-                     breakiterator="true"
-                     version="true"
-                     use="true"
-                     windowtitle="JAXWS API">
-            <ant:arg
-                    line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
-            <ant:sourcepath>
-                <ant:pathelement location="src"/>
-            </ant:sourcepath>
-        </ant:javadoc>
-    </goal>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
+
+<project default="jar"
+         xmlns:j="jelly:core" 
+         xmlns:u="jelly:util"
+         xmlns:maven="jelly:maven"
+         xmlns:util="jelly:util"
+         xmlns:deploy="deploy"
+         xmlns:ant="jelly:ant">
+
+    <preGoal name="itest:compile">
+        <u:file var="file" name="${maven.itest.src}"/>
+        <j:if test="${!file.exists()}">
+            <j:expr value="${context.setVariable('maven.itest.skip', 'true')}"/>
+        </j:if>
+    </preGoal>
+    
+
+<!-- run the JAXB schema compiler -->
+    <preGoal name="test:compile">
+        <!--<j:if test="context.getVariable('maven.test.skip') != 'true'}">-->
+
+        <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="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 echo.xsd</ant:echo>
+        <java classname="com.sun.tools.xjc.Driver" fork="true"> 
+        	<jvmarg line="${maven.junit.jvmargs}"/>
+        	<classpath refid="maven.dependency.classpath"/>
+        	<classpath location="${compiled.classes.dir}"/>
+            <arg line="-d ${schema.generated.src.dir} -quiet ${schema.source.dir}/echo.xsd"/>
+        </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"/>
+        <!--</j:if>-->
+    </preGoal>
+    
+	<preGoal name="test:test">
+		<ant:copy toDir="target/test-classes/services/EchoService/">
+			<ant:fileset dir="target/test-classes">
+				<ant:include name="server/**"/>
+			</ant:fileset>
+			<ant:fileset dir="test/server">
+				<ant:exclude name="**/*.java"/>
+			</ant:fileset>
+		</ant:copy>
+        <!-- ================================================================ -->
+        <!--- Provider endpoint Service Samples -->
+        <!-- ================================================================ -->
+		<ant:copy toDir="target/test-classes/services/StringProviderService/">
+			<ant:fileset dir="target/test-classes">
+				<ant:include name="org/apache/axis2/jaxws/provider/string/**"/>
+			</ant:fileset>
+			<ant:fileset dir="test/org/apache/axis2/jaxws/provider/string">
+                <ant:include name="META-INF/**"/>
+			</ant:fileset>
+			<ant:fileset dir="target/classes">
+                <ant:include name="org/apache/axis2/jaxws/server/**"/>
+			</ant:fileset>
+		</ant:copy>
+		<ant:copy toDir="target/test-classes/services/SourceProviderService/">
+			<ant:fileset dir="target/test-classes">
+				<ant:include name="org/apache/axis2/jaxws/provider/source/**"/>
+			</ant:fileset>
+			<ant:fileset dir="test/org/apache/axis2/jaxws/provider/source">
+                <ant:include name="META-INF/**"/>
+			</ant:fileset>
+			<ant:fileset dir="target/classes">
+                <ant:include name="org/apache/axis2/jaxws/server/**"/>
+			</ant:fileset>
+		</ant:copy>
+	</preGoal>
+
+    <!-- Create the API and Impl jars --> 
+    <postGoal name="jar">
+        <jar destfile="target/jaxws-api-${jaxws.version}.jar">
+            <ant:fileset dir="target/classes">
+            	<ant:exclude name="com/ibm/webservices/**"/>
+            </ant:fileset>
+        </jar>
+    	<jar destfile="target/jaxws-impl-${jaxws.version}.jar">
+    	    <ant:fileset dir="target/classes">
+                <ant:exclude name="javax/**"/>
+            </ant:fileset>
+    	</jar>
+        <ant:copy toDir="${maven.repo.local}/jaxws/jars">
+            <ant:fileset file="target/jaxws-impl-${jaxws.version}.jar"/>
+        	<ant:fileset file="target/jaxws-api-${jaxws.version}.jar"/>
+        </ant:copy>
+    </postGoal>
+
+    <goal name="jar">
+        <attainGoal name="jar:install"/>
+
+    </goal>
+
+    <goal name="release" prereqs="dist-bin,dist-src">
+
+
+    </goal>
+
+    <goal name="dist-bin" prereqs="jar">
+
+        <ant:echo>+----------------------------------------------</ant:echo>
+        <ant:echo>| Creating: JAXWS Binary Distribution</ant:echo>
+        <ant:echo>+----------------------------------------------</ant:echo>
+
+
+        <property name="dist" value="target/dist/temp"/>
+
+        <mkdir dir="${dist}"/>
+        <mkdir dir="${dist}/apidocs"/>
+        <mkdir dir="${dist}/build"/>
+        <!--<mkdir dir="${dist}/docs"/>-->
+        <mkdir dir="${dist}/lib"/>
+
+        <!--copy dependent jars-->
+        <maven:reactor basedir="${basedir}"
+                       postProcessing="true"
+                       includes="project.xml"
+                       banner="Executing (${goals}):"
+                       ignoreFailures="false"/>
+        <j:forEach var="x" items="${reactorProjects}">
+            <ant:echo message="Copying ${x} to ${dist}"/>
+            <deploy:copy-deps todir="${dist}/lib"
+                              projectDescriptor="${x.getFile()}"/>
+        </j:forEach>
+        <ant:delete file="${dist}/lib/xmlunit-${xmlunit.version}.jar"/>
+
+        <!--Add the licenses of jars-->
+        <ant:copy toDir="${dist}/lib">
+            <ant:fileset dir="legal"/>
+        </ant:copy>
+
+        <!--add api docs-->
+
+        <ant:javadoc packagenames="org.apache.jaxws.*"
+                     defaultexcludes="yes"
+                     destdir="${dist}/apidocs"
+                     author="true"
+                     breakiterator="true"
+                     version="true"
+                     use="true"
+                     windowtitle="JAXWS API">
+            <ant:arg
+                    line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
+            <ant:sourcepath>
+                <ant:pathelement location="src"/>
+            </ant:sourcepath>
+            <ant:classpath>
+                <ant:fileset dir="${dist}/lib">
+                    <ant:include name="*.jar"/>
+                </ant:fileset>
+            </ant:classpath>
+        </ant:javadoc>
+
+        <!--add jars-->
+        <ant:copy toDir="${dist}/build">
+            <ant:fileset file="target/jaxws-api-${jaxws.version}.jar"/>
+            <ant:fileset file="target/jaxws-impl-${jaxws.version}.jar"/>
+        </ant:copy>
+
+        <!--add documents-->
+        <ant:copy toDir="${dist}/docs">
+            <ant:fileset dir="xdocs">
+                <ant:exclude name="**/.svn/**"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <!--copy release notes, etc-->
+        <ant:copy toDir="${dist}">
+            <ant:fileset file="RELEASE-NOTE.txt"/>
+            <ant:fileset file="README.txt"/>
+            <ant:fileset file="NOTICE.txt"/>
+            <ant:fileset file="LICENSE.txt"/>
+        </ant:copy>
+
+
+        <!--create the zip-->
+        <ant:zip file="target/dist/jaxws-${jaxws.version}-bin.zip">
+            <ant:fileset dir="${dist}/"/>
+        </ant:zip>
+
+        <ant:delete dir="${dist}"/>
+
+    </goal>
+
+    <goal name="dist-src" prereqs="jar">
+
+        <ant:echo>+----------------------------------------------</ant:echo>
+        <ant:echo>| Creating: JAXWS Source Distribution</ant:echo>
+        <ant:echo>+----------------------------------------------</ant:echo>
+
+        <ant:property name="${dist}" value="target/dist/temp"/>
+
+        <ant:copy toDir="${dist}">
+            <ant:fileset dir=".">
+                <ant:exclude name="**/.svn/**"/>
+                <ant:include name="**/src/**"/>
+                <ant:include name="**/test/**"/>
+            </ant:fileset>
+        </ant:copy>
+
+        <!-- Copy the master maven files for the standard src distro -->
+        <ant:copy toDir="${dist}">
+            <ant:fileset file="maven.xml"/>
+            <ant:fileset file="project.xml"/>
+            <ant:fileset file="project.properties"/>
+            <ant:fileset file="RELEASE-NOTE.txt"/>
+            <ant:fileset file="NOTICE.txt"/>
+            <ant:fileset file="LICENSE.txt"/>
+        </ant:copy>
+
+        <ant:zip file="target/dist/jaxws-${jaxws.version}-src.zip">
+            <ant:fileset dir="${dist}/"/>
+        </ant:zip>
+        <ant:delete dir="${dist}"/>
+    </goal>
+
+    <goal name="javadocs">
+
+        <mkdir dir="target/apidocs"/>
+
+        <ant:javadoc packagenames="org.apache.jaxws.*"
+                     defaultexcludes="yes"
+                     destdir="target/apidocs"
+                     author="true"
+                     breakiterator="true"
+                     version="true"
+                     use="true"
+                     windowtitle="JAXWS API">
+            <ant:arg
+                    line="-J-Dhttp.proxy.port=${maven.proxy.port} -J-Dhttp.proxy.host=${maven.proxy.host}"/>
+            <ant:sourcepath>
+                <ant:pathelement location="src"/>
+            </ant:sourcepath>
+        </ant:javadoc>
+    </goal>
+
+</project>

Added: webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/echo.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/echo.xsd?rev=422206&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/echo.xsd (added)
+++ webservices/axis2/trunk/java/modules/jaxws/test-resources/xsd/echo.xsd Sat Jul 15 05:18:44
2006
@@ -0,0 +1,20 @@
+<!-- This schema is used to generate the JAX-B artifacts 
+     used by the JAX-B Dispatch tests -->
+<s:schema xmlns:s="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified" 
+	targetNamespace="http://test">
+  <s:element name="echoString">
+    <s:complexType>
+      <s:sequence>
+        <s:element minOccurs="0" maxOccurs="1" name="input" type="s:string" />
+      </s:sequence>
+    </s:complexType>
+  </s:element>
+  <s:element name="echoStringResponse">
+    <s:complexType>
+      <s:sequence>
+        <s:element minOccurs="0" maxOccurs="1" name="echoStringReturn" type="s:string"
/>
+      </s:sequence>
+    </s:complexType>
+  </s:element>
+</s:schema>
\ No newline at end of file

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBCallbackHandler.java?rev=422206&r1=422205&r2=422206&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBCallbackHandler.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBCallbackHandler.java
Sat Jul 15 05:18:44 2006
@@ -19,7 +19,7 @@
 import javax.xml.ws.AsyncHandler;
 import javax.xml.ws.Response;
 
-import client.EchoStringResponse;
+import test.EchoStringResponse;
 
 public class JAXBCallbackHandler<T> implements AsyncHandler<T> {
 

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBDispatch.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBDispatch.java?rev=422206&r1=422205&r2=422206&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBDispatch.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/JAXBDispatch.java
Sat Jul 15 05:18:44 2006
@@ -24,9 +24,9 @@
 import javax.xml.ws.WebServiceException;
 
 import junit.framework.TestCase;
-import client.EchoString;
-import client.EchoStringResponse;
-import client.ObjectFactory;
+import test.EchoString;
+import test.EchoStringResponse;
+import test.ObjectFactory;
 
 public class JAXBDispatch extends TestCase {
 
@@ -45,7 +45,7 @@
         //Create the JAX-B Dispatch object
         JAXBContext jbc = null;
         try {
-            jbc = JAXBContext.newInstance("client");
+            jbc = JAXBContext.newInstance("test");
             dispatch = svc.createDispatch(DispatchTestConstants.QNAME_PORT, 
                     jbc, Service.Mode.PAYLOAD);
         } catch (Exception e) {

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java?rev=422206&r1=422205&r2=422206&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/BlockTests.java
Sat Jul 15 05:18:44 2006
@@ -38,8 +38,8 @@
 import org.apache.axis2.jaxws.message.util.Reader2Writer;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
 
-import client.EchoString;
-import client.ObjectFactory;
+import test.EchoString;
+import test.ObjectFactory;
 
 import junit.framework.TestCase;
 
@@ -306,7 +306,7 @@
         ObjectFactory factory = new ObjectFactory();
         EchoString jaxb = factory.createEchoString(); 
         jaxb.setInput("Hello World");
-        JAXBContext jbc = JAXBContext.newInstance("client");
+        JAXBContext jbc = JAXBContext.newInstance("test");
         JAXBIntrospector jbi = jbc.createJAXBIntrospector();
         QName expectedQName = jbi.getElementName(jaxb);
         
@@ -354,7 +354,7 @@
         ObjectFactory factory = new ObjectFactory();
         EchoString jaxb = factory.createEchoString(); 
         jaxb.setInput("Hello World");
-        JAXBContext jbc = JAXBContext.newInstance("client");
+        JAXBContext jbc = JAXBContext.newInstance("test");
         JAXBIntrospector jbi = jbc.createJAXBIntrospector();
         QName expectedQName = jbi.getElementName(jaxb);
         
@@ -402,7 +402,7 @@
         ObjectFactory factory = new ObjectFactory();
         EchoString jaxb = factory.createEchoString(); 
         jaxb.setInput("Hello World");
-        JAXBContext jbc = JAXBContext.newInstance("client");
+        JAXBContext jbc = JAXBContext.newInstance("test");
 		
 		// On inbound, there will already be a XMLStreamReader (probably from OM)
 		// which represents the message.  We will simulate this with inflow.
@@ -447,7 +447,7 @@
         ObjectFactory factory = new ObjectFactory();
         EchoString jaxb = factory.createEchoString(); 
         jaxb.setInput("Hello World");
-        JAXBContext jbc = JAXBContext.newInstance("client");
+        JAXBContext jbc = JAXBContext.newInstance("test");
         JAXBIntrospector jbi = jbc.createJAXBIntrospector();
         QName expectedQName = jbi.getElementName(jaxb);
 		
@@ -500,7 +500,7 @@
         ObjectFactory factory = new ObjectFactory();
         EchoString jaxb = factory.createEchoString(); 
         jaxb.setInput("Hello World");
-        JAXBContext jbc = JAXBContext.newInstance("client");
+        JAXBContext jbc = JAXBContext.newInstance("test");
         JAXBIntrospector jbi = jbc.createJAXBIntrospector();
         QName expectedQName = jbi.getElementName(jaxb);
 		

Modified: webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java?rev=422206&r1=422205&r2=422206&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java
(original)
+++ webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/message/XMLStreamReaderSplitterTests.java
Sat Jul 15 05:18:44 2006
@@ -33,8 +33,8 @@
 import org.apache.axis2.jaxws.message.util.XMLStreamReaderSplitter;
 import org.apache.axis2.jaxws.registry.FactoryRegistry;
 
-import client.EchoString;
-import client.ObjectFactory;
+import test.EchoString;
+import test.ObjectFactory;
 
 import junit.framework.TestCase;
 



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


Mime
View raw message