Author: thomas.diesler(a)jboss.com Date: 2007-08-13 12:39:50 -0400 (Mon, 13 Aug 2007) New Revision: 4345 Modified: stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml stack/native/branches/native-2.0/ant.properties.example stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java Log: [JBWS-1738] Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew. Cannot reproduce Modified: stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml =================================================================== --- stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml 2007-08-13 16:38:09 UTC (rev 4344) +++ stack/native/branches/native-2.0/ant-import/macros-deploy-native.xml 2007-08-13 16:39:50 UTC (rev 4345) @@ -141,12 +141,13 @@ </fileset> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss42.jar"/> - <include name="policy.jar"/> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> + <include name="jboss-xml-binding.jar"/> + <include name="policy.jar"/> <include name="stax-ex.jar"/> <include name="streambuffer.jar"/> <include name="wsdl4j.jar"/> @@ -154,6 +155,11 @@ </copy> <!-- SERVER JARS --> + <copy todir="${jboss42.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <include name="jbossws-jboss42.jar"/> @@ -232,12 +238,6 @@ <unzip dest="${jboss40.home}/bin" src=&quot;(a){stacklibs}/jbossws-core-scripts.zip&quot;/&gt; <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/> - <copy todir="${jboss40.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jboss-xml-binding.jar"/> - </fileset> - </copy> - <!-- CLIENT JARS --> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="@{stacklibs}"> @@ -264,6 +264,12 @@ </copy> <!-- SERVER JARS --> + <copy todir="${jboss40.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jboss-xml-binding.jar"/> + </fileset> + </copy> + <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <include name="jboss-jaxrpc.jar"/> @@ -274,7 +280,6 @@ <include name="jbossws-jboss40.jar"/> <include name="wsdl4j.jar"/> </fileset> - </copy> <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> Modified: stack/native/branches/native-2.0/ant.properties.example =================================================================== --- stack/native/branches/native-2.0/ant.properties.example 2007-08-13 16:38:09 UTC (rev 4344) +++ stack/native/branches/native-2.0/ant.properties.example 2007-08-13 16:39:50 UTC (rev 4345) @@ -3,15 +3,12 @@ # # $Id$ -# JDK settings -#java.home.jdk16=/usr/java/jdk1.6 - # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA #jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -# The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] +# The JBoss server under test. This can be [jboss50|jboss42|jboss40] jbossws.integration.target=jboss50 # The JBoss server instance @@ -33,6 +30,9 @@ # Force thirdparty HTTP get #force.thirdparty.get=true +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + # Java Compiler options javac.debug=yes javac.deprecation=yes Modified: stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java =================================================================== --- stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-13 16:38:09 UTC (rev 4344) +++ stack/native/branches/native-2.0/src/test/java/org/jboss/test/ws/jaxrpc/jbws349/JBWS349TestCase.java 2007-08-13 16:39:50 UTC (rev 4345) @@ -29,8 +29,6 @@ import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; - - /** * Polymorphism in return types * @@ -58,26 +56,23 @@ endpoint = (ServiceFacadeEndpoint)service.getPort(ServiceFacadeEndpoint.class); } - } public void testAssetCreate() throws Exception { - System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew"); -// Event event = new AssetCreate("AssetCreate", 1, "templ"); -// AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event); -// assertEquals("AssetCreate", retObj.getId()); + Event event = new AssetCreate("AssetCreate", 1, "templ"); + AssetCreateResult retObj = (AssetCreateResult)endpoint.processEvent(event); + assertEquals("AssetCreate", retObj.getId()); } public void testAssetRead() throws Exception { - System.out.println("FIXME [JBWS-1738]: Regression between jbossxb 1.0.0.GA and 1.0.0.GA-brew"); -// Event event = new AssetRead("AssetRead"); -// AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event); -// assertEquals("AssetRead", retObj.getId()); -// assertEquals("body", retObj.getBody()); + Event event = new AssetRead("AssetRead"); + AssetReadResult retObj = (AssetReadResult)endpoint.processEvent(event); + assertEquals("AssetRead", retObj.getId()); + assertEquals("body", retObj.getBody()); } - + public void testEvent() throws Exception { try