Author: thomas.diesler(a)jboss.com Date: 2007-05-23 07:02:24 -0400 (Wed, 23 May 2007) New Revision: 3208 Modified: trunk/build/ant-import/build-testsuite.xml trunk/integration/jbws/ant-import/build-deploy.xml trunk/integration/sunri/ant-import/build-deploy.xml trunk/integration/xfire/ant-import/build-deploy.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/ejb-jar.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/webservices.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/wstools-config.xml trunk/jbossws-core/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml Log: Fix core jboss42 issues Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -107,9 +107,11 @@ </path> <path id="tests.client.classpath"> <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jaxb-xjc.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss50.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - <pathelement location="${jboss.client}/log4j.jar"/> - <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> @@ -139,9 +141,11 @@ <path id="tests.client.classpath"> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jaxb-xjc.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossws-jboss42.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> Modified: trunk/integration/jbws/ant-import/build-deploy.xml =================================================================== --- trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/integration/jbws/ant-import/build-deploy.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -34,6 +34,9 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> <fileset dir="${core.dir}/thirdparty"> @@ -78,11 +81,9 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> - <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss50.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> @@ -114,6 +115,9 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> + <fileset dir="${int.jboss42.dir}/output/lib"> + <include name="jbossws-jboss42.jar"/> + </fileset> </copy> <copy todir="${jboss42.home}/lib" overwrite="true"> <fileset dir="${spi.dir}/output/lib"> @@ -148,15 +152,12 @@ <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> <include name="jbossws-client.jar"/> - <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> <fileset dir="${jboss42.home}/lib"> <include name="jbossws-integration.jar"/> <!-- The old integration jar--> - <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jbossws-jboss42.jar"/> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> <include name="jboss-saaj.jar"/> Modified: trunk/integration/sunri/ant-import/build-deploy.xml =================================================================== --- trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/integration/sunri/ant-import/build-deploy.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -29,6 +29,9 @@ <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> Modified: trunk/integration/xfire/ant-import/build-deploy.xml =================================================================== --- trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/integration/xfire/ant-import/build-deploy.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -29,6 +29,9 @@ <include name="jaxb-impl.jar"/> <include name="jaxb-xjc.jar"/> </fileset> + <fileset dir="${int.jboss50.dir}/output/lib"> + <include name="jbossws-jboss50.jar"/> + </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> <fileset dir="${thirdparty.dir}"> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws331/META-INF/jboss-client.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -7,7 +7,7 @@ <service-ref> <service-ref-name>service/HelloService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws331/HelloEndpoint?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws331/HelloBean?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/ejb-jar.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/ejb-jar.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/ejb-jar.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -7,7 +7,7 @@ <enterprise-beans> <session> - <ejb-name>JBWS626TestBean</ejb-name> + <ejb-name>DemoBean</ejb-name> <service-endpoint>org.jboss.test.ws.jaxrpc.jbws626.DemoEndpoint</service-endpoint> <ejb-class>org.jboss.test.ws.jaxrpc.jbws626.DemoBean</ejb-class> <session-type>Stateless</session-type> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/webservices.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/webservices.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/META-INF/webservices.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -8,7 +8,7 @@ <wsdl-port>impl:DemoEndpointPort</wsdl-port> <service-endpoint-interface>org.jboss.test.ws.jaxrpc.jbws626.DemoEndpoint</service-endpoint-interface> <service-impl-bean> - <ejb-link>JBWS626TestBean</ejb-link> + <ejb-link>DemoBean</ejb-link> </service-impl-bean> <!-- Manual --> <handler> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/wstools-config.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/wstools-config.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws626/wstools-config.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -19,7 +19,7 @@ <namespaces target-namespace="http://org.jboss.test.webservice/jbws626" type-namespace="http://org.jboss.test.webservice/jbws626/types" /> <mapping file="jaxrpc-mapping.xml"/> - <webservices ejb-link="JBWS626TestBean"/> + <webservices ejb-link="DemoBean"/> </java-wsdl> </configuration> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/jbws772/META-INF-ONE/jboss-client.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -14,7 +14,7 @@ <service-ref> <service-ref-name>service/TestService</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws772/HelloSLSB?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-jbws772/HelloEJBOne?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF/jboss.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -3,12 +3,17 @@ <!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd"> <jboss> + + <webservices> + <context-root>/jaxrpc-samples-jsr109ejb-doc</context-root> + </webservices> + <enterprise-beans> <session> <ejb-name>TestService</ejb-name> <port-component> <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/jaxrpc-samples-jsr109ejb-doc/*</port-component-uri> + <port-component-uri>/*</port-component-uri> </port-component> </session> </enterprise-beans> Modified: trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml =================================================================== --- trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2007-05-23 10:50:19 UTC (rev 3207) +++ trunk/jbossws-core/src/test/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF/jboss.xml 2007-05-23 11:02:24 UTC (rev 3208) @@ -5,6 +5,7 @@ <jboss> <webservices> + <context-root>/jaxrpc-samples-jsr109ejb-rpc</context-root> <webservice-description> <webservice-description-name>TestService</webservice-description-name> <wsdl-publish-location>file:@wsdl-publish-location@/jsr109ejb</wsdl-publish-location> @@ -16,7 +17,7 @@ <ejb-name>TestService</ejb-name> <port-component> <port-component-name>TestServicePort</port-component-name> - <port-component-uri>/jaxrpc-samples-jsr109ejb-rpc/*</port-component-uri> + <port-component-uri>/*</port-component-uri> </port-component> </session> </enterprise-beans>