[jbossws-commits] JBossWS SVN: r2385 - in trunk: build/ant-import and 102 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-02-16 09:02:27 -0500 (Fri, 16 Feb 2007) New Revision: 2385 Added: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml trunk/build/hudson/jboss/ trunk/build/hudson/jboss/bin/ trunk/build/hudson/jboss/bin/jboss.sh trunk/build/hudson/jboss/bin/runjboss.sh trunk/integration-jboss40/src/main/resources/jbossws.beans/ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/ trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/ trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml Removed: trunk/build/etc/jboss.sh trunk/build/etc/runjboss.sh trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml trunk/build/hudson/jboss/bin/ trunk/build/hudson/jboss/bin/jboss.sh trunk/build/hudson/jboss/bin/runjboss.sh trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/xop/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/client/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/ trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml Modified: trunk/build/ant-import/build-release.xml trunk/build/ant-import/build-setup.xml trunk/build/ant-import/build-thirdparty.xml trunk/build/hudson/hudson-home/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml trunk/build/version.properties trunk/integration-jboss40/build.xml trunk/integration-jboss42/build.xml trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServerConfigImpl.java trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml trunk/integration-jboss50/build.xml trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml trunk/jbossws-core/.classpath trunk/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/KernelLocator.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerConfig.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml trunk/jbossws-core/src/main/resources/samples/build.xml trunk/jbossws-core/src/main/resources/samples/version.properties trunk/jbossws-tests/.classpath trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml trunk/jbossws-tests/ant-import/build-jars-jaxws.xml trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml trunk/jbossws-tests/ant-import/build-samples-jaxws.xml trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml trunk/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: svn merge -r2283:2288 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2295:2320 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2332:2352 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2359:2360 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2362:2368 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2369:2371 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 svn merge -r2375:2382 https://svn.jboss.org/repos/jbossws/branches/jbossws-1.2.0 [JBWS-1115] Auto discover HTTP(S) port configuration from Tomcat [JBWS-1525] Fix complex jsr181 test [JBWS-1503] Support XOP samples in tomcat [JBWS-800] ClassCastException when trying to marshal a SybaseTimestamp [JBWS-1517] Resolve dependency on juddi-service.sar [JBWS-1418] Provide JBossWS API docs jbossxb-1.0.0.CR9 Include jboss-4.0.5 in release matrix Conditionally compile ejb3 support in jboss42 integration Resurect wsbpel schemaBinding.setReplacePropertyRefs(false); exclude wsconsume,wsprovide when jdk14 Add JAX-WS WS-Security sample Support ServiceExt.setSecurityConfig() Integrate wsconsume,wsprovide in samples Simplify WebServiceRef setters Fix mtom configs Exclude @WebServiceRef handling from jboss40-jdk14 Deploy jbossws-wsconsume-impl.jar Modified: trunk/build/ant-import/build-release.xml =================================================================== --- trunk/build/ant-import/build-release.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/ant-import/build-release.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -128,8 +128,8 @@ <!-- ================================================================== --> <!-- Build the bin dist --> - <target name="build-bin-dist" description="Build the binary distribution" - depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-docs"> + <target name="build-bin-dist" depends="core-jars,jboss50-jars,jboss42-jars,jboss40-jars,jboss40-jars14,tomcat-jars,build-samples,build-javadoc,build-docs" + description="Build the binary distribution"> <mkdir dir="${build.bin.dist}"/> <mkdir dir="${build.bin.dist}/bin"/> @@ -163,6 +163,9 @@ <!-- samples --> <copy todir="${build.bin.dist}" file="${build.output.dir}/${samples.target}.zip" overwrite="true"/> + <!-- javadoc --> + <copy todir="${build.bin.dist}" file="${build.output.dir}/jbossws-${version.id}-api.zip" overwrite="true"/> + <!-- documentation --> <copy todir="${build.bin.dist}/docs/html" overwrite="true"> <fileset dir="${docs.userguide.dir}/build/en/html"/> @@ -263,4 +266,22 @@ includes="jbossws-src-${version.id}/**"/> </target> + <!-- ================================================================== --> + <!-- Documentation --> + <!-- ================================================================== --> + + <!-- Generate the JavaDoc --> + <target name="build-javadoc" depends="init" description="Generate the Javadoc"> + <mkdir dir="${build.output.dir}/docs/api"/> + <javadoc destdir="${build.output.dir}/docs/api" author="true" version="true" use="true" windowtitle="JBossWS API"> + <packageset dir="${core.java.dir}" defaultexcludes="yes"/> + <packageset dir="${jboss42.java.dir}" defaultexcludes="yes"/> + <packageset dir="${jboss50.java.dir}" defaultexcludes="yes"/> + <packageset dir="${tomcat.java.dir}" defaultexcludes="yes"/> + <classpath refid="core.classpath"/> + </javadoc> + <zip destfile="${build.output.dir}/jbossws-${version.id}-api.zip" basedir="${build.output.dir}/docs" + includes="api/**"/> + </target> + </project> Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/ant-import/build-setup.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -64,7 +64,7 @@ <property name="tomcat.webapps.dir" value="${tomcat.home}/webapps"/> <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> - <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/> + <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> <property name="jboss40.available.file" value="${jboss40.client}/jboss-client.jar"/> <property name="tomcat.available.file" value="${tomcat.home}/server/lib/catalina.jar"/> Modified: trunk/build/ant-import/build-thirdparty.xml =================================================================== --- trunk/build/ant-import/build-thirdparty.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/ant-import/build-thirdparty.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -45,12 +45,14 @@ <get src="${jboss.repository}/jboss/common-logging-log4j/${jboss-common-logging-log4j}/lib/jboss-logging-log4j.jar" dest="${thirdparty.dir}/jboss-logging-log4j.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/common-logging-spi/${jboss-common-logging-spi}/lib/jboss-logging-spi.jar" dest="${thirdparty.dir}/jboss-logging-spi.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs.jar" dest="${thirdparty.dir}/jboss-vfs.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-vfs/${jboss-vfs}/lib/jboss-vfs-sources.jar" dest="${thirdparty.dir}/jboss-vfs-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro.jar" dest="${thirdparty.dir}/jbossretro.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossretro/${jboss-jbossretro}/lib/jbossretro-rt.jar" dest="${thirdparty.dir}/jbossretro-rt.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> - <!--get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-src.zip" dest="${thirdparty.dir}/jboss-xml-binding-src.zip" usetimestamp="true" verbose="true"/--> + <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding-sources.jar" dest="${thirdparty.dir}/jboss-xml-binding-sources.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-container.jar" dest="${thirdparty.dir}/jboss-container.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-dependency.jar" dest="${thirdparty.dir}/jboss-dependency.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/microcontainer/${jboss-microcontainer}/lib/jboss-microcontainer.jar" dest="${thirdparty.dir}/jboss-microcontainer.jar" usetimestamp="true" verbose="true"/> @@ -72,7 +74,6 @@ <get src="${jboss.repository}/xmlunit-xmlunit/${xmlunit}/lib/xmlunit1.0.jar" dest="${thirdparty.dir}/xmlunit1.0.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/wscommons-policy/${wscommons-policy}/lib/policy.jar" dest="${thirdparty.dir}/policy.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume-impl}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <mkdir dir="${thirdparty.dir}/jbpm-bpel"/> <unzip dest="${thirdparty.dir}/jbpm-bpel" src="${thirdparty.dir}/jbpm-bpel.sar"/> Deleted: trunk/build/etc/jboss.sh =================================================================== --- trunk/build/etc/jboss.sh 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/etc/jboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,52 +0,0 @@ -#!/bin/sh - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -JBOSS_HOME="$1" -export JBOSS_HOME -CMD="$2" - -# -# Helper to complain. -# -warn() { - echo "$PROGNAME: $*" -} - -if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then - warn "Cannot find: $JBOSS_HOME/bin/run.sh" - exit 1 -fi - -case "$CMD" in -start) - # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid - # It relies on bash specific features - # Do you want to hide jboss output? - /bin/bash $DIRNAME/runjboss.sh &> /dev/null & - sleep 20 - ;; -stop) - pidfile="$JBOSS_HOME/bin/jboss.pid" - if [ -f "$pidfile" ]; then - pid=`cat "$pidfile"` - echo "kill pid: $pid" - kill $pid - if [ "$?" -eq 0 ]; then - # process exists, wait for it to die, and force if not - sleep 20 - kill -9 $pid &> /dev/null - fi - rm "$pidfile" - else - warn "No pid found, using shutdown" - $JBOSS_HOME/bin/shutdown.sh -S > /dev/null & - fi - ;; -restart) - $0 stop - $0 start - ;; -*) - echo "usage: $0 jboss_instance (start|stop|restart|help)" -esac Deleted: trunk/build/etc/runjboss.sh =================================================================== --- trunk/build/etc/runjboss.sh 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/etc/runjboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,208 +0,0 @@ -#!/bin/bash -### ====================================================================== ### -## ## -## JBoss Bootstrap Script ## -## ## -### ====================================================================== ### - -### $Id: run.sh 58679 2006-11-27 10:21:09Z mladen.turk(a)jboss.com $ ### - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` -GREP="grep" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to puke. -# -die() { - warn $* - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false; -darwin=false; -case "`uname`" in - CYGWIN*) - cygwin=true - ;; - - Darwin*) - darwin=true - ;; -esac - -# Read an optional running configuration file -if [ "x$RUN_CONF" = "x" ]; then - RUN_CONF="$DIRNAME/run.conf" -fi -if [ -r "$RUN_CONF" ]; then - . "$RUN_CONF" -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$JBOSS_HOME" ] && - JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$JAVAC_JAR" ] && - JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"` -fi - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Increase the maximum file descriptors if we can -if [ "$cygwin" = "false" ]; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ]; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ]; then - # use the system max - MAX_FD="$MAX_FD_LIMIT" - fi - - ulimit -n $MAX_FD - if [ $? -ne 0 ]; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query system maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -# Setup the classpath -runjar="$JBOSS_HOME/bin/run.jar" -if [ ! -f "$runjar" ]; then - die "Missing required file: $runjar" -fi -JBOSS_BOOT_CLASSPATH="$runjar" - -# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK -# compatible distribution which JAVA_HOME points to -if [ "x$JAVAC_JAR" = "x" ]; then - JAVAC_JAR="$JAVA_HOME/lib/tools.jar" -fi -if [ ! -f "$JAVAC_JAR" ]; then - # MacOSX does not have a seperate tools.jar - if [ "$darwin" != "true" ]; then - warn "Missing file: $JAVAC_JAR" - warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE." - fi -fi - -if [ "x$JBOSS_CLASSPATH" = "x" ]; then - JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" -else - JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" -fi - -# If -server not set in JAVA_OPTS, set it, if supported -SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"` -if [ "x$SERVER_SET" = "x" ]; then - - # Check for SUN(tm) JVM w/ HotSpot support - if [ "x$HAS_HOTSPOT" = "x" ]; then - HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot` - fi - - # Enable -server if we have Hotspot, unless we can't - if [ "x$HAS_HOTSPOT" != "x" ]; then - # MacOS does not support -server flag - if [ "$darwin" != "true" ]; then - JAVA_OPTS="-server $JAVA_OPTS" - fi - fi -fi - -# Setup JBosst Native library path -JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native" -if [ -d "$JBOSS_NATIVE_DIR" ]; then - if $cygwin ; then - export PATH="$JBOSS_NATIVE_DIR:$PATH" - JBOSS_NATIVE_DIR=`cygpath --dos "$JBOSS_NATIVE_DIR"` - fi - if [ "x$LD_LIBRARY_PATH" = "x" ]; then - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR" - else - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH" - fi - export LD_LIBRARY_PATH - if [ "x$JAVA_OPTS" = "x" ]; then - JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR" - else - JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - -# Display our environment -echo "=========================================================================" -echo "" -echo " JBoss Bootstrap Environment" -echo "" -echo " JBOSS_HOME: $JBOSS_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -echo " CLASSPATH: $JBOSS_CLASSPATH" -echo "" -echo "=========================================================================" -echo "" -# enable monitor mode (job control needed) -set -m -STATUS=10 -while [ $STATUS -eq 10 ] -do -# Execute the JVM - "$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -classpath "$JBOSS_CLASSPATH" \ - org.jboss.Main "$@" & - echo $! > $JBOSS_HOME/bin/jboss.pid - fg - STATUS=$? - # if it doesn't work, you may want to take a look at this: - # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html -done Modified: trunk/build/hudson/hudson-home/config.xml =================================================================== --- trunk/build/hudson/hudson-home/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -18,6 +18,7 @@ <tr><th align=left&gt;@hudson.jboss50.build@&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss50.rev@ @hudson.jboss50.url@</td></tr> <tr><th align=left&gt;@hudson.jboss42.build@-ejb3&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss42.rev@ @hudson.jboss42.url@</td></tr> <tr><th align=left&gt;@hudson.jboss40.build@-ejb3&lt;/th&gt;&lt;td&gt;-r(a)hudson.jboss40.rev@ @hudson.jboss40.url@</td></tr> + <tr><th align=left>jboss-4.0.5.GA-ejb3</th><td>https://svn.jboss.o... <tr><th align=left>apache-tomcat-@apache-tomcat@</th></tr> </table> ]]> @@ -72,6 +73,8 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> + <string>JBWS-Tests-AS-4.0.5</string> + <string>JBWS-Tests-AS-4.0.5-jdk14</string> <string>JBWS-Tests-AS-4.0</string> <string>JBWS-Tests-AS-4.0-jdk14</string> <string>JBWS-Tests-AS-4.2</string> @@ -93,6 +96,7 @@ <owner reference="../../.."/> <jobNames class="tree-set"> <no-comparator/> + <string>JBWS-Samples-AS-4.0.5</string> <string>JBWS-Samples-AS-4.0</string> <string>JBWS-Samples-AS-4.2</string> <string>JBWS-Samples-AS-5.0</string> @@ -127,6 +131,8 @@ <tr align=center><th align=left>AS-4.2</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0</th><td>ok</td><td>ok</td><td>ok</td></tr> <tr align=center><th align=left>AS-4.0-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> +<tr align=center><th align=left>AS-4.0.5</th><td>ok</td><td>ok</td><td>ok</td></tr> +<tr align=center><th align=left>AS-4.0.5-jdk14</th><td>ok</td><td>ok</td><td>N/A</td></tr> <tr align=center><th align=left>TC-5.5</th><td>ok</td><td>N/A</td><td>ok</td></tr> </table> ]]> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,7 +33,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # build the testsuite @@ -57,7 +57,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.0-jdk14/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -35,7 +35,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # build the testsuite @@ -59,7 +59,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-4.2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,7 +33,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # build the testsuite @@ -57,7 +57,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBAS-Tests-AS-5.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -33,7 +33,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # build the testsuite @@ -57,7 +57,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-4.2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -16,7 +16,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -27,7 +27,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +46,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Sanity-AS-5.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -16,7 +16,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -27,7 +27,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +46,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-4.2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -16,7 +16,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -27,7 +27,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +46,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Local-Tests-AS-5.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -16,7 +16,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -27,7 +27,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +46,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -26,7 +26,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build jbossws samples @@ -36,7 +36,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute samples @@ -49,7 +49,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5 (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-15 14:01:52 UTC (rev 2368) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,79 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Samples-AS-4.0.5 -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 -JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ -TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; - -JBOSS_INSTANCE=$JBOSS40_INSTANCE - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop - -# -# build jbossws samples -# -ant $ENVIRONMENT clean deploy-jboss40 build-samples - -# -# start jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start - -# -# execute samples -# -cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ -cp ant.properties.example ant.properties -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <!--hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - <hudson.tasks.Mailer--> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.0</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.0.5/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,79 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Samples-AS-4.0.5 +WORKSPACE=`pwd` +SVNBASEDIR=$WORKSPACE/(a)svn.basename@ +JBOSS40_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/Branch_4_2/build/output/@hudson.jboss42.build(a)-ejb3 +JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/trunk/build/output/(a)hudson.jboss50.build@ +TOMCAT_INSTANCE=@hudson.home(a)/jobs/TC-5.5/workspace/apache-tomcat +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS40_INSTANCE -Djboss42.home=$JBOSS42_INSTANCE -Djboss50.home=$JBOSS50_INSTANCE -Dtomcat.home=$TOMCAT_INSTANCE&quot; + +JBOSS_INSTANCE=$JBOSS40_INSTANCE + +# +# copy ant.properties +# +cd $SVNBASEDIR/build +cp ant.properties.example ant.properties + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# build jbossws samples +# +ant $ENVIRONMENT clean deploy-jboss40 build-samples + +# +# start jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start + +# +# execute samples +# +cd $SVNBASEDIR/build/output/jbossws-samples-(a)version.id@ +cp ant.properties.example ant.properties +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults&gt;@svn.basename@/build/output/jbossws-samples-@version.id(a)/output/reports/*.xml&lt;/testResults&gt; + </hudson.tasks.junit.JUnitResultArchiver> + <!--hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + <hudson.tasks.Mailer--> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <modules&gt;@svn.url(a)&lt;/modules&gt; + <useUpdate>true</useUpdate> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build and test jbossws-(a)version.id@ against AS-4.0</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-4.2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -26,7 +26,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build jbossws samples @@ -36,7 +36,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute samples @@ -49,7 +49,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Samples-AS-5.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -26,7 +26,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # build jbossws samples @@ -36,7 +36,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute samples @@ -49,7 +49,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -32,7 +32,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -44,7 +44,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0-jdk14/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -34,7 +34,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -46,7 +46,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5 (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-02-15 14:01:52 UTC (rev 2368) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,74 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Tests-AS-4.0.5 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -ant $ENVIRONMENT clean deploy-jboss40 - -# -# start jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <!--hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - <hudson.tasks.Mailer--> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.0.5</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,74 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Tests-AS-4.0.5 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=$WORKSPACE/(a)svn.basename@ +JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; + +# +# copy ant.properties +# +cd $SVNBASEDIR/build +cp ant.properties.example ant.properties + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +ant $ENVIRONMENT clean deploy-jboss40 + +# +# start jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; + </hudson.tasks.junit.JUnitResultArchiver> + <!--hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + <hudson.tasks.Mailer--> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <modules&gt;@svn.url(a)&lt;/modules&gt; + <useUpdate>true</useUpdate> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build and test jbossws-(a)version.id@ against AS-4.0.5</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14 (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14) Deleted: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml =================================================================== --- branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml 2007-02-15 14:01:52 UTC (rev 2368) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,76 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<project> - <builders class="vector"> - <hudson.tasks.Shell> - <command> -# -# Module settings -# -MODULE=JBWS-Tests-AS-4.0.5-jdk14 -SVNBASENAME=(a)svn.basename@ -WORKSPACE=`pwd` -SVNBASEDIR=$WORKSPACE/(a)svn.basename@ -JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5-jdk14/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA -ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; - -# -# copy ant.properties -# -cd $SVNBASEDIR/build -cp ant.properties.example ant.properties - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop - -# -# deploy to jboss -# -ant $ENVIRONMENT clean deploy-jboss40-jdk14 - -export JAVA_HOME=(a)hudson.jdk14@ - -# -# start jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start - -# -# execute tests -# -cd $SVNBASEDIR/jbossws-tests -ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out -cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u - -# -# stop jbossas -# -$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop -</command> - </hudson.tasks.Shell> - </builders> - <publishers class="vector"> - <hudson.tasks.junit.JUnitResultArchiver> - <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; - </hudson.tasks.junit.JUnitResultArchiver> - <!--hudson.tasks.Mailer> - <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; - <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> - <sendToIndividuals>false</sendToIndividuals> - <hudson.tasks.Mailer--> - </publishers> - <buildWrappers class="vector"/> - <scm class="hudson.scm.SubversionSCM"> - <modules&gt;@svn.url(a)&lt;/modules&gt; - <useUpdate>true</useUpdate> - </scm> - <canRoam>true</canRoam> - <disabled>false</disabled> - <enableRemoteTrigger>false</enableRemoteTrigger> - <triggers class="vector"/> - <description>Build and test jbossws-(a)version.id@ against AS-4.0 with JDK1.4</description> - <keepDependencies>false</keepDependencies> - <properties/> - <actions class="vector"/> -</project> \ No newline at end of file Copied: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml (from rev 2368, branches/jbossws-1.2.0/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml) =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml (rev 0) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.0.5-jdk14/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,76 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=JBWS-Tests-AS-4.0.5-jdk14 +SVNBASENAME=(a)svn.basename@ +WORKSPACE=`pwd` +SVNBASEDIR=$WORKSPACE/(a)svn.basename@ +JBOSS_INSTANCE=@hudson.home(a)/jobs/AS-4.0.5-jdk14/workspace/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA +ENVIRONMENT=&quot;-Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE&quot; + +# +# copy ant.properties +# +cd $SVNBASEDIR/build +cp ant.properties.example ant.properties + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# deploy to jboss +# +ant $ENVIRONMENT clean deploy-jboss40-jdk14 + +export JAVA_HOME=(a)hudson.jdk14@ + +# +# start jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start + +# +# execute tests +# +cd $SVNBASEDIR/jbossws-tests +ant $ENVIRONMENT tests 2>&amp;1 | tee $WORKSPACE/tests.out +cat $WORKSPACE/tests.out | egrep FIXME\|FAILED | sort -u + +# +# stop jbossas +# +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults&gt;@svn.basename(a)/jbossws-tests/output/reports/*.xml&lt;/testResults&gt; + </hudson.tasks.junit.JUnitResultArchiver> + <!--hudson.tasks.Mailer> + <recipients&gt;@hudson.mail.recipients(a)&lt;/recipients&gt; + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>false</sendToIndividuals> + <hudson.tasks.Mailer--> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <modules&gt;@svn.url(a)&lt;/modules&gt; + <useUpdate>true</useUpdate> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <description>Build and test jbossws-(a)version.id@ against AS-4.0 with JDK1.4</description> + <keepDependencies>false</keepDependencies> + <properties/> + <actions class="vector"/> +</project> \ No newline at end of file Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-4.2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -32,7 +32,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -44,7 +44,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/JBWS-Tests-AS-5.0/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,7 +22,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # # deploy to jboss @@ -32,7 +32,7 @@ # # start jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE start +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE start # # execute tests @@ -44,7 +44,7 @@ # # stop jbossas # -$SVNBASEDIR/build/etc/jboss.sh $JBOSS_INSTANCE stop +$SVNBASEDIR/build/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop </command> </hudson.tasks.Shell> </builders> Modified: trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/hudson/hudson-home/jobs/Release-Matrix-Step2/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-TC-5.5</childProjects> + <childProjects>JBWS-Tests-AS-5.0, JBWS-Tests-AS-4.2, JBWS-Tests-AS-4.0, JBWS-Tests-AS-4.0-jdk14, JBWS-Tests-AS-4.0.5, JBWS-Tests-AS-4.0.5-jdk14, JBWS-Tests-TC-5.5, JBAS-Tests-AS-5.0, JBAS-Tests-AS-4.2, JBAS-Tests-AS-4.0, JBAS-Tests-AS-4.0-jdk14, JBWS-Samples-AS-5.0, JBWS-Samples-AS-4.2, JBWS-Samples-AS-4.0, JBWS-Samples-AS-4.0.5, JBWS-Samples-TC-5.5</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Copied: trunk/build/hudson/jboss (from rev 2320, branches/jbossws-1.2.0/build/hudson/jboss) Copied: trunk/build/hudson/jboss/bin (from rev 2320, branches/jbossws-1.2.0/build/hudson/jboss/bin) Deleted: trunk/build/hudson/jboss/bin/jboss.sh =================================================================== --- branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh 2007-02-09 12:27:17 UTC (rev 2320) +++ trunk/build/hudson/jboss/bin/jboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,52 +0,0 @@ -#!/bin/sh - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` -JBOSS_HOME="$1" -export JBOSS_HOME -CMD="$2" - -# -# Helper to complain. -# -warn() { - echo "$PROGNAME: $*" -} - -if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then - warn "Cannot find: $JBOSS_HOME/bin/run.sh" - exit 1 -fi - -case "$CMD" in -start) - # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid - # It relies on bash specific features - # Do you want to hide jboss output? - /bin/bash $DIRNAME/runjboss.sh & - sleep 20 - ;; -stop) - pidfile="$JBOSS_HOME/bin/jboss.pid" - if [ -f "$pidfile" ]; then - pid=`cat "$pidfile"` - echo "kill pid: $pid" - kill $pid - if [ "$?" -eq 0 ]; then - # process exists, wait for it to die, and force if not - sleep 20 - kill -9 $pid &> /dev/null - fi - rm "$pidfile" - else - warn "No pid found, using shutdown" - $JBOSS_HOME/bin/shutdown.sh -S > /dev/null & - fi - ;; -restart) - $0 stop - $0 start - ;; -*) - echo "usage: $0 jboss_instance (start|stop|restart|help)" -esac Copied: trunk/build/hudson/jboss/bin/jboss.sh (from rev 2320, branches/jbossws-1.2.0/build/hudson/jboss/bin/jboss.sh) =================================================================== --- trunk/build/hudson/jboss/bin/jboss.sh (rev 0) +++ trunk/build/hudson/jboss/bin/jboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,52 @@ +#!/bin/sh + +PROGNAME=`basename $0` +DIRNAME=`dirname $0` +JBOSS_HOME="$1" +export JBOSS_HOME +CMD="$2" + +# +# Helper to complain. +# +warn() { + echo "$PROGNAME: $*" +} + +if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then + warn "Cannot find: $JBOSS_HOME/bin/run.sh" + exit 1 +fi + +case "$CMD" in +start) + # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid + # It relies on bash specific features + # Do you want to hide jboss output? + /bin/bash $DIRNAME/runjboss.sh & + sleep 20 + ;; +stop) + pidfile="$JBOSS_HOME/bin/jboss.pid" + if [ -f "$pidfile" ]; then + pid=`cat "$pidfile"` + echo "kill pid: $pid" + kill $pid + if [ "$?" -eq 0 ]; then + # process exists, wait for it to die, and force if not + sleep 20 + kill -9 $pid &> /dev/null + fi + rm "$pidfile" + else + warn "No pid found, using shutdown" + $JBOSS_HOME/bin/shutdown.sh -S > /dev/null & + fi + ;; +restart) + $0 stop + $0 start + ;; +*) + echo "usage: $0 jboss_instance (start|stop|restart|help)" +esac Deleted: trunk/build/hudson/jboss/bin/runjboss.sh =================================================================== --- branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh 2007-02-09 12:27:17 UTC (rev 2320) +++ trunk/build/hudson/jboss/bin/runjboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,149 +0,0 @@ -#!/bin/bash -### ====================================================================== ### -## ## -## JBoss Bootstrap Script ## -## ## -### ====================================================================== ### - -### $Id: run.sh 58679 2006-11-27 10:21:09Z mladen.turk(a)jboss.com $ ### - -DIRNAME=`dirname $0` -PROGNAME=`basename $0` -GREP="grep" - -# Use the maximum available, or set MAX_FD != -1 to use that -MAX_FD="maximum" - -# -# Helper to complain. -# -warn() { - echo "${PROGNAME}: $*" -} - -# -# Helper to puke. -# -die() { - warn $* - exit 1 -} - -# Setup JBOSS_HOME -if [ "x$JBOSS_HOME" = "x" ]; then - # get the full path (without any relative bits) - JBOSS_HOME=`cd $DIRNAME/..; pwd` -fi -export JBOSS_HOME - -# Read an optional running configuration file -if [ "x$RUN_CONF" = "x" ]; then - RUN_CONF="$JBOSS_HOME/bin/run.conf" -fi -if [ -r "$RUN_CONF" ]; then - . "$RUN_CONF" -fi - -# Setup the JVM -if [ "x$JAVA" = "x" ]; then - if [ "x$JAVA_HOME" != "x" ]; then - JAVA="$JAVA_HOME/bin/java" - else - JAVA="java" - fi -fi - -# Setup the classpath -runjar="$JBOSS_HOME/bin/run.jar" -if [ ! -f "$runjar" ]; then - die "Missing required file: $runjar" -fi -JBOSS_BOOT_CLASSPATH="$runjar" - -# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK -# compatible distribution which JAVA_HOME points to -if [ "x$JAVAC_JAR" = "x" ]; then - JAVAC_JAR="$JAVA_HOME/lib/tools.jar" -fi -if [ ! -f "$JAVAC_JAR" ]; then - warn "Missing file: $JAVAC_JAR" - warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE." -fi - -if [ "x$JBOSS_CLASSPATH" = "x" ]; then - JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" -else - JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" -fi - -# If -server not set in JAVA_OPTS, set it, if supported -SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"` -if [ "x$SERVER_SET" = "x" ]; then - - # Check for SUN(tm) JVM w/ HotSpot support - if [ "x$HAS_HOTSPOT" = "x" ]; then - HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot` - fi - - # Enable -server if we have Hotspot, unless we can't - if [ "x$HAS_HOTSPOT" != "x" ]; then - JAVA_OPTS="-server $JAVA_OPTS" - fi -fi - -# Setup JBosst Native library path -JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native" -if [ -d "$JBOSS_NATIVE_DIR" ]; then - if [ "x$LD_LIBRARY_PATH" = "x" ]; then - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR" - else - LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH" - fi - export LD_LIBRARY_PATH - if [ "x$JAVA_OPTS" = "x" ]; then - JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR" - else - JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR" - fi -fi - -#JPDA options. Uncomment and modify as appropriate to enable remote debugging . -#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" - -# Setup JBoss sepecific properties -JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS" - -# Setup the java endorsed dirs -JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" - -# Display our environment -echo "=========================================================================" -echo "" -echo " JBoss Bootstrap Environment" -echo "" -echo " JBOSS_HOME: $JBOSS_HOME" -echo "" -echo " JAVA: $JAVA" -echo "" -echo " JAVA_OPTS: $JAVA_OPTS" -echo "" -echo " CLASSPATH: $JBOSS_CLASSPATH" -echo "" -echo "=========================================================================" -echo "" -# enable monitor mode (job control needed) -set -m -STATUS=10 -while [ $STATUS -eq 10 ] -do -# Execute the JVM - "$JAVA" $JAVA_OPTS \ - -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ - -classpath "$JBOSS_CLASSPATH" \ - org.jboss.Main "$@" &> /dev/null & - echo $! > $JBOSS_HOME/bin/jboss.pid - fg - STATUS=$? - # if it doesn't work, you may want to take a look at this: - # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html -done Copied: trunk/build/hudson/jboss/bin/runjboss.sh (from rev 2320, branches/jbossws-1.2.0/build/hudson/jboss/bin/runjboss.sh) =================================================================== --- trunk/build/hudson/jboss/bin/runjboss.sh (rev 0) +++ trunk/build/hudson/jboss/bin/runjboss.sh 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,149 @@ +#!/bin/bash +### ====================================================================== ### +## ## +## JBoss Bootstrap Script ## +## ## +### ====================================================================== ### + +### $Id: run.sh 58679 2006-11-27 10:21:09Z mladen.turk(a)jboss.com $ ### + +DIRNAME=`dirname $0` +PROGNAME=`basename $0` +GREP="grep" + +# Use the maximum available, or set MAX_FD != -1 to use that +MAX_FD="maximum" + +# +# Helper to complain. +# +warn() { + echo "${PROGNAME}: $*" +} + +# +# Helper to puke. +# +die() { + warn $* + exit 1 +} + +# Setup JBOSS_HOME +if [ "x$JBOSS_HOME" = "x" ]; then + # get the full path (without any relative bits) + JBOSS_HOME=`cd $DIRNAME/..; pwd` +fi +export JBOSS_HOME + +# Read an optional running configuration file +if [ "x$RUN_CONF" = "x" ]; then + RUN_CONF="$JBOSS_HOME/bin/run.conf" +fi +if [ -r "$RUN_CONF" ]; then + . "$RUN_CONF" +fi + +# Setup the JVM +if [ "x$JAVA" = "x" ]; then + if [ "x$JAVA_HOME" != "x" ]; then + JAVA="$JAVA_HOME/bin/java" + else + JAVA="java" + fi +fi + +# Setup the classpath +runjar="$JBOSS_HOME/bin/run.jar" +if [ ! -f "$runjar" ]; then + die "Missing required file: $runjar" +fi +JBOSS_BOOT_CLASSPATH="$runjar" + +# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK +# compatible distribution which JAVA_HOME points to +if [ "x$JAVAC_JAR" = "x" ]; then + JAVAC_JAR="$JAVA_HOME/lib/tools.jar" +fi +if [ ! -f "$JAVAC_JAR" ]; then + warn "Missing file: $JAVAC_JAR" + warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE." +fi + +if [ "x$JBOSS_CLASSPATH" = "x" ]; then + JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" +else + JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR" +fi + +# If -server not set in JAVA_OPTS, set it, if supported +SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"` +if [ "x$SERVER_SET" = "x" ]; then + + # Check for SUN(tm) JVM w/ HotSpot support + if [ "x$HAS_HOTSPOT" = "x" ]; then + HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot` + fi + + # Enable -server if we have Hotspot, unless we can't + if [ "x$HAS_HOTSPOT" != "x" ]; then + JAVA_OPTS="-server $JAVA_OPTS" + fi +fi + +# Setup JBosst Native library path +JBOSS_NATIVE_DIR="$JBOSS_HOME/bin/native" +if [ -d "$JBOSS_NATIVE_DIR" ]; then + if [ "x$LD_LIBRARY_PATH" = "x" ]; then + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR" + else + LD_LIBRARY_PATH="$JBOSS_NATIVE_DIR:$LD_LIBRARY_PATH" + fi + export LD_LIBRARY_PATH + if [ "x$JAVA_OPTS" = "x" ]; then + JAVA_OPTS="-Djava.library.path=$JBOSS_NATIVE_DIR" + else + JAVA_OPTS="$JAVA_OPTS -Djava.library.path=$JBOSS_NATIVE_DIR" + fi +fi + +#JPDA options. Uncomment and modify as appropriate to enable remote debugging . +#JAVA_OPTS="-classic -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n $JAVA_OPTS" + +# Setup JBoss sepecific properties +JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS" + +# Setup the java endorsed dirs +JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" + +# Display our environment +echo "=========================================================================" +echo "" +echo " JBoss Bootstrap Environment" +echo "" +echo " JBOSS_HOME: $JBOSS_HOME" +echo "" +echo " JAVA: $JAVA" +echo "" +echo " JAVA_OPTS: $JAVA_OPTS" +echo "" +echo " CLASSPATH: $JBOSS_CLASSPATH" +echo "" +echo "=========================================================================" +echo "" +# enable monitor mode (job control needed) +set -m +STATUS=10 +while [ $STATUS -eq 10 ] +do +# Execute the JVM + "$JAVA" $JAVA_OPTS \ + -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \ + -classpath "$JBOSS_CLASSPATH" \ + org.jboss.Main "$@" &> /dev/null & + echo $! > $JBOSS_HOME/bin/jboss.pid + fg + STATUS=$? + # if it doesn't work, you may want to take a look at this: + # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html +done Modified: trunk/build/version.properties =================================================================== --- trunk/build/version.properties 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/build/version.properties 2007-02-16 14:02:27 UTC (rev 2385) @@ -17,7 +17,7 @@ apache-xmlsec=1.3.0 ibm-wsdl4j=1.5.2jboss javassist=3.4.GA -jboss-jbossxb=snapshot +jboss-jbossxb=1.0.0.CR9 jboss-microcontainer=1.0.2 jboss-remoting=2.0.0.GA sun-jaxb=2.0.3 @@ -38,11 +38,12 @@ jboss-common-logging-log4j=2.0.2.GA jboss-common-logging-spi=2.0.2.GA jboss-ejb3=1.0.0.CR9-jboss4.0.5 +jboss-jaxr=1.2.0.GA jboss-jbossretro=1.0.4.GA jboss-security=4.0.5.GA jboss-vfs=2.0.0.Beta2 jbossas-core-libs=4.0.5.GA -jbossws-wsconsume-impl=2.0.0 +jbossws-wsconsume=2.0.0 jbpm-bpel=1.1.Beta3 junit=3.8.1 oswego-concurrent=1.3.4 Modified: trunk/integration-jboss40/build.xml =================================================================== --- trunk/integration-jboss40/build.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss40/build.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -52,7 +52,7 @@ | documentation compiles. --> - <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-check-ejb3-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/> + <target name="jboss40-compile" depends="jboss40-compile-classes,jboss40-compile-ejb3-classes,jboss40-compile-etc" description="Compile all source files."/> <!-- Compile integration java sources --> <target name="jboss40-compile-classes" depends="jboss40-init,core-compile"> @@ -68,7 +68,7 @@ <classpath path="${core.output.classes.dir}"/> </javac> </target> - <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile" if="jboss40.ejb3.available"> + <target name="jboss40-compile-ejb3-classes" depends="jboss40-init,core-compile,jboss40-check-ejb3-classes" if="jboss40.ejb3.available"> <mkdir dir="${jboss40.output.classes.dir}"/> <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss40.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> @@ -206,8 +206,6 @@ <jar jarfile="${jboss40.output.lib.dir}/jbossws14-core.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> <include name="org/jboss/ws/**"/> - <include name="javax/jws/**"/> - <include name="javax/xml/ws/**"/> </fileset> <fileset dir="${core.dir}/src/main/resources"> <include name="schema/**"/> @@ -215,6 +213,15 @@ </fileset> </jar> + <!-- Build jboss-jaxws14.jar --> + <mkdir dir="${jboss40.output.lib.dir}"/> + <jar jarfile="${jboss40.output.lib.dir}/jboss-jaxws14.jar" manifest="${etc.dir}/default.mf"> + <fileset dir="${jboss40.output.classes14.dir}"> + <include name="javax/jws/**"/> + <include name="javax/xml/ws/**"/> + </fileset> + </jar> + <!-- Build jbossws14-jboss40-integration.jar --> <jar jarfile="${jboss40.output.lib.dir}/jbossws14-jboss40-integration.jar" manifest="${etc.dir}/default.mf"> <fileset dir="${jboss40.output.classes14.dir}"> @@ -270,14 +277,12 @@ <include name="wstx-lgpl-2.9.3.jar"/> <include name="xmlsec.jar"/> </fileset> - <fileset dir="${jboss42.resources.dir}"> + <fileset dir="${jboss40.resources.dir}"> <include name="jbossws.beans/META-INF/jboss-beans.xml"/> </fileset> <metainf dir="${core.resources.dir}/jbossws.sar/META-INF"> <include name="standard-jaxrpc-client-config.xml"/> <include name="standard-jaxrpc-endpoint-config.xml"/> - <include name="standard-jaxws-client-config.xml"/> - <include name="standard-jaxws-endpoint-config.xml"/> </metainf> <metainf dir="${jboss40.output.dir}/resources/jbossws40-jdk14.sar/META-INF"> <include name="jboss-service.xml"/> @@ -303,6 +308,7 @@ <fileset dir="${thirdparty.dir}"> <include name="jaxb-api.jar"/> <include name="jaxb-impl.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> </fileset> </copy> <copy todir="${jboss40.home}/server/${jboss.server.instance}/lib" overwrite="true"> @@ -333,11 +339,16 @@ <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target> <!-- Deploy jbossws to jboss40 jdk1.4 --> <target name="deploy-jboss40-jdk14" depends="jboss40-jars14" description="Deploy jbossws"> <delete file="${jboss40.home}/client/jbossws-client.jar"/> + <delete file="${jboss40.home}/server/${jboss.server.instance}/lib/jboss-jaxws.jar"/> <copy todir="${jboss40.home}/client" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -356,6 +367,9 @@ <include name="jboss-jaxrpc.jar"/> <include name="jboss-saaj.jar"/> </fileset> + <fileset dir="${jboss40.output.lib.dir}"> + <include name="jboss-jaxws14.jar"/> + </fileset> </copy> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/> @@ -377,6 +391,10 @@ <copy todir="${jboss40.home}//../../../thirdparty/jboss/jbossxb/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/client" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> <copy todir="${jboss40.home}/lib" file="${thirdparty.dir}/jboss-xml-binding.jar" overwrite="true"/> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target> <!-- ================================================================== --> Copied: trunk/integration-jboss40/src/main/resources/jbossws.beans (from rev 2320, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans) Copied: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF (from rev 2320, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF) Deleted: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-09 12:27:17 UTC (rev 2320) +++ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"> - - <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> - - <!-- - The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> - element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. - - If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true. - If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. - - If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>. - --> - <property name="webServiceHost">${jboss.bind.address}</property> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> - <property name="alwaysModifySOAPAddress">true</property> - - <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> - <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB3</property> - <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB21</property> - <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerMDB</property> - </bean> - - <bean name="ServiceEndpointDeployer" class="org.jboss.ws.core.server.ServiceEndpointDeployer"> - <property name="serviceEndpointManager"> - <inject bean="ServiceEndpointManager"/> - </property> - </bean> - - <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss42.ServiceEndpointPublisher"> - <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property> - </bean> - - <!-- - Bind JAXWS Service objects in client environment context - JAX-WS functionality is not available with jdk-1.4 - <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss42.WebServiceRefHandler"/> - --> - - <!-- A subscription manager for WS-Eventing --> - <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> - - <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/> - - <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> - <!--property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property--> - </bean> - -</deployment> Copied: trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml (from rev 2320, branches/jbossws-1.2.0/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml) =================================================================== --- trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml (rev 0) +++ trunk/integration-jboss40/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" + xmlns="urn:jboss:bean-deployer"> + + <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + + <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> + + <!-- + The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> + element which points to the location of the endpoint. JBoss supports rewriting of that SOAP address. + + If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless 'alwaysModifySOAPAddress' is true. + If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. + + If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>. + --> + <property name="webServiceHost">${jboss.bind.address}</property> + <property name="alwaysModifySOAPAddress">true</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. --> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + + <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> + <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB3</property> + <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB21</property> + <property name="serviceEndpointInvokerMDB">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerMDB</property> + </bean> + + <bean name="ServiceEndpointDeployer" class="org.jboss.ws.core.server.ServiceEndpointDeployer"> + <property name="serviceEndpointManager"> + <inject bean="ServiceEndpointManager"/> + </property> + </bean> + + <bean name="ServiceEndpointPublisher" class="org.jboss.ws.integration.jboss42.ServiceEndpointPublisher"> + <property name="serviceEndpointServlet">org.jboss.ws.integration.jboss42.JBossServiceEndpointServlet</property> + </bean> + + <!-- + Bind JAXWS Service objects in client environment context + JAX-WS functionality is not available with jdk-1.4 + <bean name="WebServiceRefHandler" class="org.jboss.ws.integration.jboss42.WebServiceRefHandler"/> + --> + + <!-- A subscription manager for WS-Eventing --> + <bean name="SubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"/> + + <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/> + +</deployment> Modified: trunk/integration-jboss42/build.xml =================================================================== --- trunk/integration-jboss42/build.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss42/build.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -27,6 +27,7 @@ <target name="jboss42-init" depends="prepare, thirdparty"> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> + <available file="${jboss42.client}/jboss-ejb3-client.jar" property="jboss42.ejb3.available"/> </target> <!-- ================================================================== --> @@ -41,7 +42,7 @@ | documentation compiles. --> - <target name="jboss42-compile" depends="jboss42-compile-classes,jboss42-compile-etc" description="Compile all source files."/> + <target name="jboss42-compile" depends="jboss42-compile-classes,jboss42-compile-ejb3-classes,jboss42-compile-etc" description="Compile all source files."/> <!-- Compile integration java sources --> <target name="jboss42-compile-classes" depends="jboss42-init,core-compile"> @@ -49,11 +50,33 @@ <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <include name="org/jboss/ws/integration/jboss42/**"/> + <exclude name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> + <exclude name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> <classpath refid="jboss42.integration.classpath"/> <classpath path="${core.output.classes14.dir}"/> <classpath path="${core.output.classes.dir}"/> </javac> </target> + <target name="jboss42-compile-ejb3-classes" depends="jboss42-init,core-compile,jboss42-check-ejb3-classes" if="jboss42.ejb3.available"> + <mkdir dir="${jboss42.output.classes.dir}"/> + <javac srcdir="${jboss42.java.dir}" sourcepath="" destdir="${jboss42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}" + deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <include name="org/jboss/ws/integration/jboss42/DeployerInterceptorEJB3.java"/> + <include name="org/jboss/ws/integration/jboss42/ServiceEndpointGeneratorEJB3.java"/> + <include name="org/jboss/ws/integration/jboss42/ServiceEndpointInvokerEJB3.java"/> + <classpath refid="jboss42.integration.classpath"/> + <classpath path="${core.output.classes14.dir}"/> + <classpath path="${core.output.classes.dir}"/> + </javac> + </target> + <target name="jboss42-check-ejb3-classes" depends="jboss42-init" unless="jboss42.ejb3.available"> + <echo message="****************************************"/> + <echo message="* EJB3 not available *"/> + <echo message="* jboss42 integartion layer will be *"/> + <echo message="* build without EJB3 support! *"/> + <echo message="****************************************"/> + </target> <!-- Compile etc files (manifests and such) --> <target name="jboss42-compile-etc" depends="jboss42-init"> @@ -143,6 +166,11 @@ <include name="jbossws-client.jar"/> </fileset> </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> <copy todir="${jboss42.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -166,6 +194,10 @@ <include name="jbossws-jboss42-integration.jar"/> </fileset> </copy> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target> <!-- ================================================================== --> Modified: trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServerConfigImpl.java =================================================================== --- trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServerConfigImpl.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss42/src/main/java/org/jboss/ws/integration/jboss42/ServerConfigImpl.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -145,6 +145,5 @@ { return -1; } - } } Modified: trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss42/src/main/resources/jbossws.beans/META-INF/jboss-beans.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -4,6 +4,10 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> <!-- @@ -16,10 +20,16 @@ If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>. --> <property name="webServiceHost">${jboss.bind.address}</property> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> <property name="alwaysModifySOAPAddress">true</property> + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. --> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB3</property> <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss42.ServiceEndpointInvokerEJB21</property> @@ -44,8 +54,4 @@ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss42.ServerConfigImpl"/> - <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> - <!--property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property--> - </bean> - </deployment> Modified: trunk/integration-jboss50/build.xml =================================================================== --- trunk/integration-jboss50/build.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss50/build.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -149,6 +149,11 @@ <include name="jbossws-client.jar"/> </fileset> </copy> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + </copy> <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="${core.output.lib.dir}"> <include name="jboss-jaxrpc.jar"/> @@ -175,6 +180,10 @@ <include name="jbossws-jboss50-integration.jar"/> </fileset> </copy> + <!-- Deploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="${thirdparty.dir}/juddi-service.sar"/> </target> <!-- ================================================================== --> Modified: trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java =================================================================== --- trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss50/src/main/java/org/jboss/ws/integration/jboss50/ServerConfigImpl.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -24,11 +24,14 @@ //$Id$ import java.io.File; +import java.util.Set; +import javax.management.AttributeNotFoundException; import javax.management.JMException; import javax.management.MBeanServer; import javax.management.ObjectName; +import org.jboss.logging.Logger; import org.jboss.mx.util.MBeanServerLocator; import org.jboss.ws.core.server.ServerConfig; import org.jboss.ws.core.utils.ObjectNameFactory; @@ -37,10 +40,13 @@ * JBoss specific implementation of a ServerConfig * * @author Thomas.Diesler(a)jboss.org + * @author darran.lofthouse(a)jboss.com * @since 08-May-2006 */ public class ServerConfigImpl implements ServerConfig { + private static final Logger log = Logger.getLogger(ServerConfigImpl.class); + public File getServerTempDir() { try @@ -70,4 +76,73 @@ return null; } } + + public int getWebServicePort() + { + int port = getConnectorPort("HTTP/1.1", false); + if (port > -1) + { + return port; + } + + log.warn("Unable to calculate 'WebServicePort', using default '8080'"); + return 8080; + } + + public int getWebServiceSecurePort() + { + int port = getConnectorPort("HTTP/1.1", true); + if (port > -1) + { + return port; + } + + log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); + return 8443; + } + + private int getConnectorPort(final String protocol, final boolean secure) + { + int port = -1; + + try + { + MBeanServer server = MBeanServerLocator.locateJBoss(); + ObjectName connectors = new ObjectName("jboss.web:type=Connector,*"); + + Set connectorNames = server.queryNames(connectors, null); + for (Object current : connectorNames) + { + ObjectName currentName = (ObjectName)current; + + try + { + int connectorPort = (Integer)server.getAttribute(currentName, "port"); + boolean connectorSecure = (Boolean)server.getAttribute(currentName, "secure"); + String connectorProtocol = (String)server.getAttribute(currentName, "protocol"); + + if (protocol.equals(connectorProtocol) && secure == connectorSecure) + { + if (port > -1) + { + log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'"); + } + else + { + port = connectorPort; + } + } + } + catch (AttributeNotFoundException ignored) + { + } + } + + return port; + } + catch (JMException e) + { + return -1; + } + } } Modified: trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml =================================================================== --- trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-jboss50/src/main/resources/jbossws.deployer/META-INF/jbossws-deployer-beans.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -2,6 +2,10 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0"> + <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> <!-- @@ -14,10 +18,16 @@ If next line (webServiceHost) is commented, JBossWS uses requesters protocolo, host and port when rewriting the <soap:address>. --> <property name="webServiceHost">${jboss.bind.address}</property> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> <property name="alwaysModifySOAPAddress">true</property> + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. --> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> <property name="serviceEndpointInvokerEJB3">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB3</property> <property name="serviceEndpointInvokerEJB21">org.jboss.ws.integration.jboss50.ServiceEndpointInvokerEJB21</property> @@ -48,10 +58,6 @@ <bean name="ServerConfig" class="org.jboss.ws.integration.jboss50.ServerConfigImpl"/> - <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> - <!--property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property--> - </bean> - <bean name="JAXWSDeployerEJB3" class="org.jboss.ws.integration.jboss50.JAXWSDeployerEJB3"> <install bean="MainDeployer" method="addDeployer"> <parameter> Modified: trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java =================================================================== --- trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-tomcat/src/main/java/org/jboss/ws/integration/tomcat/ServerConfigImpl.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -65,4 +65,14 @@ return null; } } + + public int getWebServicePort() + { + return 8080; + } + + public int getWebServiceSecurePort() + { + return 8443; + } } Modified: trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml =================================================================== --- trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/integration-tomcat/src/main/resources/jbossws.war/META-INF/jboss-beans.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -4,6 +4,10 @@ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> + <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + <bean name="ServiceEndpointManager" class="org.jboss.ws.core.server.ServiceEndpointManager"> <!-- The WSDL, that is a required deployment artifact for an endpoint, has a <soap:address> @@ -12,10 +16,17 @@ If the content of <soap:address> is a valid URL, JBossWS will not rewrite it unless AlwaysModifySOAPAddress is true. If the content of <soap:address> is not a valid URL, JBossWS will rewrite it using the attribute values given below. --> + <property name="webServiceHost">localhost</property> <property name="alwaysModifySOAPAddress">true</property> - <property name="webServiceHost">localhost</property> - <property name="webServiceSecurePort">8443</property> - <property name="webServicePort">8080</property> + + <!-- + Set these properties to explicitly define the ports that will be used for rewriting the SOAP address. + Otherwise the ports will be identified by querying the list of installed connectors. + If multiple connectors are found the port of the first connector is used. --> + <property name="webServiceSecurePort">8443</property> + <property name="webServicePort">8080</property> + --> + <property name="serviceEndpointInvokerJSE">org.jboss.ws.core.server.ServiceEndpointInvokerJSE</property> </bean> @@ -37,6 +48,4 @@ <bean name="ServerConfig" class="org.jboss.ws.integration.tomcat.ServerConfigImpl"/> - <bean name="KernelLocator" class="org.jboss.ws.core.server.KernelLocator"/> - </deployment> Modified: trunk/jbossws-core/.classpath =================================================================== --- trunk/jbossws-core/.classpath 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/.classpath 2007-02-16 14:02:27 UTC (rev 2385) @@ -14,7 +14,7 @@ <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-log4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-logging-spi.jar"/> <classpathentry kind="lib" path="/build/thirdparty/jboss-remoting.jar"/> - <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-src.zip"/> + <classpathentry kind="lib" path="/build/thirdparty/jboss-xml-binding.jar" sourcepath="/build/thirdparty/jboss-xml-binding-sources.jar"/> <classpathentry kind="lib" path="/build/thirdparty/wsdl4j.jar"/> <classpathentry kind="lib" path="/build/thirdparty/xmlsec.jar"/> <classpathentry kind="lib" path="/build/thirdparty/ejb3.deployer/jboss-annotations-ejb3.jar"/> Modified: trunk/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/annotation/security/SecurityDomain.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -21,6 +21,8 @@ */ package org.jboss.annotation.security; +// $Id$ + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @@ -28,18 +30,24 @@ /** * Annotation for specifying the JBoss security domain for an EJB - * DO NOT USE THE JNDI NAME: - * - "java:/jaas/MyDomain" ILLEGAL - * - "MyDomain" GOOD - * + * * @author <a href="mailto:bill@jboss.org">Bill Burke</a> - * @version $Revision$ - * **/ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface SecurityDomain { + /** + * The required name for the security domain. + * + * Do not use the JNDI name + * + * Good: "MyDomain" + * Bad: "java:/jaas/MyDomain" + */ String value(); + /** + * The name for the unauthenticated pricipal + */ String unauthenticatedPrincipal() default ""; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/EndpointConfig.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,13 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.ws.annotation; +// $Id: $ + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** + * Defines an endpoint or client configuration. + * This annotation is valid on an endpoint implementaion bean or a SEI. + * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 16.01.2007 */ @Retention(value = RetentionPolicy.RUNTIME) @@ -15,7 +40,7 @@ public @interface EndpointConfig { /** - * The optional config-name element gives the client configuration name that must be present in + * The optional config-name element gives the configuration name that must be present in * the configuration given by element config-file. * * Server side default: Standard Endpoint @@ -24,11 +49,10 @@ String configName() default ""; /** - * The optional config-file element gives the to a URL or resource name for the configuration. + * The optional config-file element is a URL or resource name for the configuration. * - * Server side default: standard-jaxrpc-endpoint-config.xml, standard-jaxws-endpoint-config.xml - * Client side default: standard-jaxrpc-client-config.xml, standard-jaxws-client-config.xml + * Server side default: standard-jaxws-endpoint-config.xml + * Client side default: standard-jaxws-client-config.xml */ String configFile() default ""; - } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/annotation/WebContext.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -88,8 +88,7 @@ * A secure endpoint does not by default publish it's wsdl on an unsecure transport. * You can override this behaviour by explicitly setting the secureWSDLAccess flag to false. * - * Protect access to WSDL - * http://jira.jboss.org/jira/browse/JBWS-723 + * Protect access to WSDL. See http://jira.jboss.org/jira/browse/JBWS-723 */ boolean secureWSDLAccess() default true; Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxrpc/binding/jbossxb/SchemaBindingBuilder.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -93,6 +93,7 @@ schemaBinding.setUnmarshalListsToArrays(true); // note: default jaxb2.0 is false! schemaBinding.setSimpleContentProperty("_value"); schemaBinding.setUseNoArgCtorIfFound(true); + schemaBinding.setReplacePropertyRefs(false); if (wsdlMapping != null) { bindSchemaToJava(schemaBinding, wsdlMapping); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/jaxws/client/ServiceExt.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -23,6 +23,7 @@ // $Id$ +import java.io.IOException; import java.net.URL; import javax.xml.namespace.QName; @@ -30,13 +31,19 @@ import javax.xml.ws.Service; import javax.xml.ws.WebServiceFeature; +import org.jboss.ws.WSException; import org.jboss.ws.core.ConfigProvider; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.UnifiedVirtualFile; +import org.jboss.ws.metadata.umdm.EndpointMetaData; +import org.jboss.ws.metadata.umdm.ServiceMetaData; +import org.jboss.ws.metadata.wsse.WSSecurityConfigFactory; +import org.jboss.ws.metadata.wsse.WSSecurityConfiguration; /** * Extends the standard JAXWS Service * * @author Thomas.Diesler(a)jboss.com - * @param <T> * @since 18-Jan-2007 */ public class ServiceExt extends Service implements ConfigProvider @@ -45,12 +52,14 @@ private String configName; // The config file for all created ports private String configFile; - + // The WS-Security config + private String securityConfig; + public ServiceExt(URL wsdlDocumentLocation, QName serviceName) { super(wsdlDocumentLocation, serviceName); } - + /** * Get the port configuration file for newly created ports */ @@ -84,6 +93,22 @@ this.configFile = configFile; } + /** + * Get the WS-Security configuration + */ + public String getSecurityConfig() + { + return securityConfig; + } + + /** + * Set the WS-Security configuration + */ + public void setSecurityConfig(String securityConfig) + { + this.securityConfig = securityConfig; + } + @Override public <T> T getPort(Class<T> serviceEndpointInterface, WebServiceFeature... features) { @@ -123,11 +148,31 @@ configurePort(port); return port; } - + private void configurePort(Object port) { ConfigProvider cp = (ConfigProvider)port; if (configName != null || configFile != null) cp.setConfigName(configName, configFile); + + if (securityConfig != null) + { + EndpointMetaData epMetaData = ((StubExt)port).getEndpointMetaData(); + ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); + if (serviceMetaData.getSecurityConfiguration() == null) + { + try + { + WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); + UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); + WSSecurityConfiguration config = wsseConfFactory.createConfiguration(vfsRoot, securityConfig); + serviceMetaData.setSecurityConfiguration(config); + } + catch (IOException ex) + { + WSException.rethrow("Cannot set security config", ex); + } + } + } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/KernelLocator.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/KernelLocator.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/KernelLocator.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -24,8 +24,6 @@ //$Id: WebServiceDeployer.java 312 2006-05-11 10:49:22Z thomas.diesler(a)jboss.com $ import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.kernel.spi.dependency.KernelControllerContextAware; /** * Locate the single instance of the kernel @@ -33,22 +31,17 @@ * @author Thomas.Diesler(a)jboss.org * @since 12-May-2006 */ -public class KernelLocator implements KernelControllerContextAware +public class KernelLocator { private static Kernel kernel; public static Kernel getKernel() { - return kernel; + return KernelLocator.kernel; } - public void setKernelControllerContext(KernelControllerContext context) throws Exception + public void setKernel(Kernel kernel) { - kernel = context.getKernel(); + KernelLocator.kernel = kernel; } - - public void unsetKernelControllerContext(KernelControllerContext arg0) throws Exception - { - kernel = null; - } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerConfig.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerConfig.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServerConfig.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -38,4 +38,8 @@ File getServerTempDir(); File getServerDataDir(); + + int getWebServicePort(); + + int getWebServiceSecurePort(); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/server/ServiceEndpointManager.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -148,11 +148,25 @@ public void setWebServicePort(int port) { + if (port == 0) + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + port = config.getWebServicePort(); + log.debug("Using WebServicePort: " + port); + } this.webServicePort = port; } public void setWebServiceSecurePort(int port) { + if (port == 0) + { + ServerConfigFactory factory = ServerConfigFactory.getInstance(); + ServerConfig config = factory.getServerConfig(); + port = config.getWebServiceSecurePort(); + log.debug("Using WebServiceSecurePort: " + port); + } this.webServiceSecurePort = port; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/EnvelopeBuilderDOM.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,6 +22,7 @@ package org.jboss.ws.core.soap; //$Id$ + import org.jboss.logging.Logger; import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.Style; @@ -35,6 +36,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; + /** * A SOAPEnvelope builder for JAXRPC based on DOM * @@ -46,7 +48,7 @@ { // provide logging private static Logger log = Logger.getLogger(EnvelopeBuilderDOM.class); - + private Style style = Style.DOCUMENT; public EnvelopeBuilderDOM(Style style) @@ -60,7 +62,6 @@ Element domEnv = null; try { - // TODO: The parser unescapes special characters, which we need to escape later on again domEnv = DOMUtils.parse(ins); } catch (IOException ex) @@ -100,7 +101,7 @@ { Element srcElement = (Element)it.next(); //registerNamespacesLocally(srcElement); - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); Name name = new NameImpl(srcElement.getLocalName(), srcElement.getPrefix(), srcElement.getNamespaceURI()); SOAPContentElement destElement = new SOAPHeaderElementImpl(name); @@ -193,8 +194,8 @@ destElement = (SOAPContentElement)soapBodyElement.addChildElement(destElement); DOMUtils.copyAttributes(destElement, srcElement); - - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); destElement.setXMLFragment(xmlFragment); } } @@ -206,8 +207,8 @@ destElement = (SOAPContentElement)soapBody.addChildElement(destElement); DOMUtils.copyAttributes(destElement, srcElement); - - XMLFragment xmlFragment = new XMLFragment( new DOMSource(srcElement) ); + + XMLFragment xmlFragment = new XMLFragment(new DOMSource(srcElement)); destElement.setXMLFragment(xmlFragment); } else if (style == null) @@ -249,7 +250,7 @@ } } } - + return soapEnv; } @@ -257,14 +258,15 @@ * Register globally available namespaces on element level. * This is necessary to ensure that each xml fragment is valid. */ - private void registerNamespacesLocally(Element srcElement) { - if(srcElement.getPrefix()== null) + private void registerNamespacesLocally(Element srcElement) + { + if (srcElement.getPrefix() == null) { srcElement.setAttribute("xmlns", srcElement.getNamespaceURI()); } else { - srcElement.setAttribute("xmlns:"+srcElement.getPrefix(), srcElement.getNamespaceURI()); + srcElement.setAttribute("xmlns:" + srcElement.getPrefix(), srcElement.getNamespaceURI()); } } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -554,7 +554,7 @@ } else { - throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation only supported for javax.xml.soap.Node, this is a " + node); + throw new DOMException(DOMException.NOT_SUPPORTED_ERR, "Operation not supported on this type of node: " + node); } return retNode; } @@ -564,9 +564,7 @@ org.w3c.dom.Node domParent = domNode.getParentNode(); if (domParent != null && soapParent == null) throw new WSException("Inconsistent node, has a DOM parent but no SOAP parent [" + this + "] " + DOMWriter.printNode(this, false)); - if (domParent == null && soapParent != null) - throw new WSException("Inconsistent node, has a SOAP parent but no DOM parent [" + this + "] " + DOMWriter.printNode(this, false)); - if (soapParent != null && domParent != soapParent.domNode) + if (domParent != null && soapParent != null && domParent != soapParent.domNode) throw new WSException("Inconsistent node, SOAP parent is not identical with DOM parent [" + this + "] " + DOMWriter.printNode(this, false)); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLContent.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -21,6 +21,8 @@ */ package org.jboss.ws.core.soap; +// $Id: $ + import org.jboss.logging.Logger; import org.jboss.ws.Constants; import org.jboss.ws.WSException; @@ -59,40 +61,42 @@ * Aggregates a {@link XMLFragment}. * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 05.02.2007 */ -class XMLContent extends SOAPContent { - +class XMLContent extends SOAPContent +{ private static final Logger log = Logger.getLogger(XMLContent.class); // The well formed XML content of this element. private XMLFragment xmlFragment; - protected XMLContent(SOAPContentElement container) { + protected XMLContent(SOAPContentElement container) + { super(container); } - State getState() { + State getState() + { return State.XML_VALID; } - SOAPContent transitionTo(State nextState) { + SOAPContent transitionTo(State nextState) + { SOAPContent next; - if(State.XML_VALID == nextState) + if (State.XML_VALID == nextState) { next = this; } - else if(State.OBJECT_VALID == nextState) + else if (State.OBJECT_VALID == nextState) { Object obj = unmarshallObjectContents(); SOAPContent objectValid = new ObjectContent(container); objectValid.setObjectValue(obj); next = objectValid; } - else if(State.DOM_VALID == nextState) + else if (State.DOM_VALID == nextState) { expandContainerChildren(); next = new DOMContent(container); @@ -105,7 +109,8 @@ return next; } - private Object unmarshallObjectContents() { + private Object unmarshallObjectContents() + { Object obj; QName xmlType = container.getXmlType(); @@ -172,14 +177,14 @@ try { String contentType = MimeUtils.resolveMimeType(javaType); - log.debug("Adopt DataHandler to " + javaType +", contentType "+ contentType); + log.debug("Adopt DataHandler to " + javaType + ", contentType " + contentType); DataSource ds = new SwapableMemoryDataSource(((DataHandler)obj).getInputStream(), contentType); DataHandler dh = new DataHandler(ds); obj = dh.getContent(); // 'application/octet-stream' will return a byte[] instead fo the stream - if(obj instanceof InputStream) + if (obj instanceof InputStream) { ByteArrayOutputStream bout = new ByteArrayOutputStream(); dh.writeTo(bout); @@ -191,7 +196,7 @@ throw new WSException("Failed to adopt XOP content type", e); } - if(!JavaUtils.isAssignableFrom(javaType, obj.getClass())) + if (!JavaUtils.isAssignableFrom(javaType, obj.getClass())) { throw new WSException("Java type '" + javaType + "' is not assignable from: " + objType.getName()); } @@ -208,7 +213,7 @@ return obj; } -// Get the deserializer factory for a given javaType and xmlType + // Get the deserializer factory for a given javaType and xmlType private static DeserializerFactoryBase getDeserializerFactory(TypeMappingImpl typeMapping, Class javaType, QName xmlType) { DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(javaType, xmlType); @@ -245,7 +250,8 @@ * Turn the xml fragment into a DOM repersentation and append * all children to the container. */ - private void expandContainerChildren() { + private void expandContainerChildren() + { Element contentRoot = xmlFragment.toElement(); @@ -264,7 +270,8 @@ SOAPFactoryImpl soapFactory = new SOAPFactoryImpl(); - try { + try + { NodeList nlist = contentRoot.getChildNodes(); for (int i = 0; i < nlist.getLength(); i++) { @@ -292,33 +299,41 @@ log.trace("Ignore child type: " + childType); } } - } catch (SOAPException e) { + } + catch (SOAPException e) + { throw new WSException("Failed to transition to DOM", e); } } - public Source getPayload() { + public Source getPayload() + { throw new IllegalStateException("Payload not available"); } - public void setPayload(Source source) { + public void setPayload(Source source) + { throw new IllegalStateException("Payload not available"); } - public XMLFragment getXMLFragment() { + public XMLFragment getXMLFragment() + { return this.xmlFragment; } - public void setXMLFragment(XMLFragment xmlFragment) { + public void setXMLFragment(XMLFragment xmlFragment) + { this.xmlFragment = xmlFragment; } - public Object getObjectValue() { + public Object getObjectValue() + { throw new IllegalStateException("Object value not available"); } - public void setObjectValue(Object objValue) { + public void setObjectValue(Object objValue) + { throw new IllegalStateException("Object value not available"); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/core/soap/XMLFragment.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -21,6 +21,8 @@ */ package org.jboss.ws.core.soap; +//$Id: $ + import org.jboss.ws.WSException; import org.jboss.ws.core.jaxrpc.binding.BufferedStreamResult; import org.jboss.ws.core.utils.DOMUtils; @@ -43,44 +45,48 @@ * @see XMLContent * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 05.02.2007 */ -public class XMLFragment { +public class XMLFragment +{ private Source source; private Result result; private boolean idempotent = true; - public XMLFragment(Source source) { + public XMLFragment(Source source) + { this.source = source; } - public XMLFragment(Result result) { + public XMLFragment(Result result) + { this.result = result; } - public Source getSource() { - if(null == source) + public Source getSource() + { + if (null == source) throw new IllegalStateException("Source not available"); return source; } - public Result getResult() { - if(null == source) + public Result getResult() + { + if (null == source) throw new IllegalStateException("Result not available"); return result; } public String toStringFragment() { - if(!idempotent) throw new IllegalStateException("Trying to call a non-idempotent operation"); + if (!idempotent) + throw new IllegalStateException("Trying to call a non-idempotent operation"); - if(this.source != null) + if (this.source != null) return sourceToStringFragement(this.source); - else - return resultToStringFragment(this.result); + else return resultToStringFragment(this.result); } /** @@ -89,26 +95,29 @@ */ public Element toElement() { - if(!idempotent) throw new IllegalStateException("Trying to call a non-idempotent operation"); + if (!idempotent) + throw new IllegalStateException("Trying to call a non-idempotent operation"); Element resultingElement = null; try { - if(source != null) + if (source != null) { resultingElement = DOMUtils.sourceToElement(source); // Any Source besides DOMSource is expected not to be idempotent - if(! (source instanceof DOMSource) ) idempotent = false; + if (!(source instanceof DOMSource)) + idempotent = false; } else { - resultingElement = DOMUtils.parse( resultToStringFragment(result)); + resultingElement = DOMUtils.parse(resultToStringFragment(result)); // Any Result besides DOMResult is expected not to be idempotent - if(! (result instanceof DOMResult) ) idempotent = false; + if (!(result instanceof DOMResult)) + idempotent = false; } } catch (IOException e) @@ -130,11 +139,12 @@ return new XMLFragment(source); } - private String resultToStringFragment(Result result) { + private String resultToStringFragment(Result result) + { - if(result instanceof DOMResult) + if (result instanceof DOMResult) { - return DOMWriter.printNode( ((DOMResult)result).getNode(), false); + return DOMWriter.printNode(((DOMResult)result).getNode(), false); } else if (result instanceof BufferedStreamResult) { @@ -146,35 +156,36 @@ throw new IllegalArgumentException("Unable to process javax.xml.transform.Result implementation: " + result); } - private static String sourceToStringFragement(Source source) { + private static String sourceToStringFragement(Source source) + { throw new IllegalArgumentException("Source should never be converted to String"); /*new RuntimeException("sourceToStringFragement").printStackTrace(System.out); - String xmlFragment = null; + String xmlFragment = null; - try { - TransformerFactory tf = TransformerFactory.newInstance(); - ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); - tf.newTransformer().transform(source, new StreamResult(baos)); - xmlFragment = new String(baos.toByteArray()); - if (xmlFragment.startsWith("<?xml")) - { - int index = xmlFragment.indexOf(">"); - xmlFragment = xmlFragment.substring(index + 1); - } - } catch (TransformerException e) { - WSException.rethrow(e); - } + try { + TransformerFactory tf = TransformerFactory.newInstance(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(1024); + tf.newTransformer().transform(source, new StreamResult(baos)); + xmlFragment = new String(baos.toByteArray()); + if (xmlFragment.startsWith("<?xml")) + { + int index = xmlFragment.indexOf(">"); + xmlFragment = xmlFragment.substring(index + 1); + } + } catch (TransformerException e) { + WSException.rethrow(e); + } - return xmlFragment; - */ + return xmlFragment; + */ } public void writeTo(Writer writer) throws IOException { - if(result != null ) + if (result != null) { writeResult(writer); } @@ -184,20 +195,21 @@ } } - /** + /** * Should only be called with <code>jbossws.SOAPMessage==TRACE</code> */ - private void writeSource(Writer writer) throws IOException { + private void writeSource(Writer writer) throws IOException + { //new RuntimeException("writeSource").printStackTrace(System.out); - if(source instanceof DOMSource) + if (source instanceof DOMSource) { DOMSource domSource = (DOMSource)source; DOMWriter dw = new DOMWriter(writer).setPrettyprint(false); dw.print(domSource.getNode()); } - else if(source instanceof StreamSource) + else if (source instanceof StreamSource) { StreamSource streamSource = (StreamSource)source; copyStream(streamSource.getInputStream(), writer); @@ -219,14 +231,15 @@ } } - private void writeResult(Writer writer) { - if(result instanceof DOMResult) + private void writeResult(Writer writer) + { + if (result instanceof DOMResult) { DOMResult domResult = (DOMResult)result; DOMWriter dw = new DOMWriter(writer).setPrettyprint(false); dw.print(domResult.getNode()); } - else if(result instanceof BufferedStreamResult) + else if (result instanceof BufferedStreamResult) { BufferedStreamResult sr = (BufferedStreamResult)result; ByteArrayOutputStream out = (ByteArrayOutputStream)sr.getOutputStream(); @@ -248,11 +261,12 @@ public void writeTo(OutputStream out) throws IOException { - writeTo( new PrintWriter(out) ); + writeTo(new PrintWriter(out)); } - public String toString() { - String contents = source != null ? "source="+source : "result="+result; - return "XMLFragment {"+contents+", idempotent="+idempotent+"}"; + public String toString() + { + String contents = source != null ? "source=" + source : "result=" + result; + return "XMLFragment {" + contents + ", idempotent=" + idempotent + "}"; } } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxrpc/WSSecurityHandler.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -32,8 +32,8 @@ import org.jboss.logging.Logger; import org.jboss.ws.WSException; +import org.jboss.ws.core.CommonMessageContext; import org.jboss.ws.core.UnifiedVirtualFile; -import org.jboss.ws.core.jaxrpc.handler.SOAPMessageContextJAXRPC; import org.jboss.ws.extensions.security.WSSecurityDispatcher; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.ServiceMetaData; @@ -62,7 +62,7 @@ { if (getSecurityConfiguration(msgContext) != null) { - WSSecurityDispatcher.handleInbound((SOAPMessageContextJAXRPC)msgContext); + WSSecurityDispatcher.handleInbound((CommonMessageContext)msgContext); } } catch (SOAPException ex) @@ -79,7 +79,7 @@ { if (getSecurityConfiguration(msgContext) != null) { - WSSecurityDispatcher.handleOutbound((SOAPMessageContextJAXRPC)msgContext); + WSSecurityDispatcher.handleOutbound((CommonMessageContext)msgContext); } } catch (SOAPException ex) @@ -96,7 +96,7 @@ */ private WSSecurityConfiguration getSecurityConfiguration(MessageContext msgContext) { - EndpointMetaData epMetaData = ((SOAPMessageContextJAXRPC)msgContext).getEndpointMetaData(); + EndpointMetaData epMetaData = ((CommonMessageContext)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); WSSecurityConfiguration config = serviceMetaData.getSecurityConfiguration(); Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/extensions/security/jaxws/WSSecurityHandler.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -93,28 +93,21 @@ EndpointMetaData epMetaData = ((CommonMessageContext)msgContext).getEndpointMetaData(); ServiceMetaData serviceMetaData = epMetaData.getServiceMetaData(); - if(null == serviceMetaData.getSecurityConfiguration()) // might be set through ServiceObjectFactory + if(serviceMetaData.getSecurityConfiguration() == null) // might be set through ServiceObjectFactory { UnifiedVirtualFile vfsRoot = serviceMetaData.getUnifiedMetaData().getRootFile(); - boolean successful = false; WSSecurityConfiguration config = null; try { WSSecurityConfigFactory wsseConfFactory = WSSecurityConfigFactory.newInstance(); config = wsseConfFactory.createConfiguration(vfsRoot, getConfigResourceName()); - if(config!=null) successful = true; - } - catch (IOException e) + catch (IOException ex) { - successful = false; + WSException.rethrow("Cannot load ws-security config", ex); } - if(!successful) - throw new WSException("Failed to access security config"); - // it's required further down the processing chain - // TODO: cleanup serviceMetaData.setSecurityConfiguration(config); } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/metadata/wsse/WSSecurityConfigFactory.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -24,6 +24,7 @@ // $Id: $ import java.io.IOException; +import java.net.MalformedURLException; import java.net.URL; import org.jboss.logging.Logger; @@ -32,7 +33,9 @@ import org.jboss.ws.metadata.builder.jaxrpc.JAXRPCServerMetaDataBuilder; /** - * @author hbraun + * Create a WSSecurityConfiguration + * + * @author Heiko.Braun(a)jboss.com * @author Thomas.Diesler(a)jboss.com */ public class WSSecurityConfigFactory @@ -47,33 +50,46 @@ public WSSecurityConfiguration createConfiguration(UnifiedVirtualFile vfsRoot, String resourceName) throws IOException { + URL configLocation = null; + try + { + configLocation = new URL(resourceName); + } + catch (MalformedURLException ex) + { + // ignore + } + + if (configLocation == null) + configLocation = getResource(vfsRoot, "WEB-INF/" + resourceName, false); + + if (configLocation == null) + configLocation = getResource(vfsRoot, "META-INF/" + resourceName, false); + WSSecurityConfiguration config = null; - - URL location = getResource(vfsRoot, "WEB-INF/" + resourceName, false); - if (null == location) - location = getResource(vfsRoot, "META-INF/" + resourceName, false); - - if (location != null) + if (configLocation != null) { - log.debug("createConfiguration from: " + location); - config = WSSecurityOMFactory.newInstance().parse(location); - + log.debug("createConfiguration from: " + configLocation); + config = WSSecurityOMFactory.newInstance().parse(configLocation); + // Get and set deployment path to the keystore file + URL keystoreLocation = null; if (config.getKeyStoreFile() != null) { - location = getResource(vfsRoot, config.getKeyStoreFile(), true); - log.debug("Add keystore: " + location); - config.setKeyStoreURL(location); + keystoreLocation = getResource(vfsRoot, config.getKeyStoreFile(), true); + log.debug("Add keystore: " + keystoreLocation); + config.setKeyStoreURL(keystoreLocation); } + URL truststoreLocation = null; if (config.getTrustStoreFile() != null) { - location = getResource(vfsRoot, config.getTrustStoreFile(), true); - log.debug("Add truststore: " + location); - config.setTrustStoreURL(location); + truststoreLocation = getResource(vfsRoot, config.getTrustStoreFile(), true); + log.debug("Add truststore: " + truststoreLocation); + config.setTrustStoreURL(truststoreLocation); } } - + return config; } Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java =================================================================== --- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/command/wsprovide.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -45,7 +45,7 @@ * -h, --help Show this help message * -k, --keep Keep/Generate Java source * -w, --wsdl Enable WSDL file generation - * -c. --classpath=&lt;path&lt; The classpath that contains the endpoint + * -c, --classpath=&lt;directory&gt; The classpath that contains the endpoint * -o, --output=&lt;directory&gt; The directory to put generated artifacts * -r, --resource=&lt;directory&gt; The directory to put resource artifacts * -s, --source=&lt;directory&gt; The directory to put Java source @@ -214,7 +214,7 @@ out.println(" -h, --help Show this help message"); out.println(" -k, --keep Keep/Generate Java source"); out.println(" -w, --wsdl Enable WSDL file generation"); - out.println(" -c. --classpath=<path> The classpath that contains the endpoint"); + out.println(" -c, --classpath=<directory> The classpath that contains the endpoint"); out.println(" -o, --output=<directory> The directory to put generated artifacts"); out.println(" -r, --resource=<directory> The directory to put resource artifacts"); out.println(" -s, --source=<directory> The directory to put Java source"); Modified: trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt =================================================================== --- trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/dist/ReleaseNotes.txt 2007-02-16 14:02:27 UTC (rev 2385) @@ -22,11 +22,95 @@ What's new in jbossws-(a)version.id@ ---------------------------------- +Feature Request + * [JBWS-1156] - Implement injection of WebServiceRef + * [JBWS-1021] - Implement javax.xml.ws.Endpoint + * [JBWS-1022] - Implement javax.xml.ws.WebServiceContext + * [JBWS-1023] - Implement javax.xml.ws.Service + * [JBWS-1024] - Implement javax.xml.ws.BindingProvider + * [JBWS-1025] - Implement javax.xml.ws.Dispatch + * [JBWS-1070] - Add context-root in generated jboss-web.xml for Endpoint API + * [JBWS-1207] - Async jaxws dispatch + * [JBWS-1208] - Async jaxws proxy + * [JBWS-1020] - Implement javax.xml.ws.Provider + * [JBWS-1192] - Examples for JSR181 EJB Endpoints: show how to use a JavaBean as an operations's argument or return value + * [JBWS-1388] - Notification validation before dispatch + * [JBWS-1406] - WS-Eventing: event notification failure + * [JBWS-1438] - Implement @WebServiceRef injection for JBossAS-4.2 + * [JBWS-1443] - getMessageContext Not Implemented + * [JBWS-1456] - Allow client configuration on StubExt + * [JBWS-1457] - Support soap attachments on StubExt + +Task + + * [JBWS-1284] - Gracefully handle invalid ImageIO mime types + * [JBWS-1297] - Implement JAXB Fault Marshalling + * [JBWS-1404] - Add support for differing namespaces on SEI and implementation bean + * [JBWS-644] - JAXWS initial implementation + * [JBWS-1031] - Use JAXB-2.0 for JSR-181 endpoints + * [JBWS-1099] - Implement JAXWS Handler Framework + * [JBWS-1150] - Implement JAXWS Logical Handlers + * [JBWS-1315] - Implement WS deployers for jbossas/trunk + * [JBWS-1425] - Update to remoting-2.0 + * [JBWS-723] - Protect access to WSDL + * [JBWS-1077] - Improve/Complete security documentation + * [JBWS-1098] - Publicly available interop endpoints + * [JBWS-1100] - Move WS-Eventing to updated wsa schema + * [JBWS-1155] - Document SwA/XOP usage with JSR181 endpoints. + * [JBWS-1307] - JAXWS user guide and samples + * [JBWS-1418] - Provide JBossWS API docs + * [JBWS-1429] - Cleanup PortComponent annotation + * [JBWS-1433] - Remerge connector discovery code + * [JBWS-1434] - Client programming: Add property API at Service level similiar to StubExt. + * [JBWS-1473] - Setup soak and performance tests + * [JBWS-1503] - Support XOP samples in tomcat + * [JBWS-1504] - Resolve dependency on snapshots + +Bug + + * [JBWS-1079] - Incorrect WSDL to Java mapping for anonymous struct. + * [JBWS-1336] - JAXWSDeployerJSE throws NPE + * [JBWS-1389] - WebServiceProvider should be allowed on EJB3 beans + * [JBWS-1409] - WsdlGenerator crashes on void-methods + * [JBWS-1168] - JAXWS handler ordering + * [JBWS-1357] - JAXWSDeployerJSE is not handling jsp servlet defs correctly + * [JBWS-1374] - Package to namespace mapping is wrong + * [JBWS-1375] - JSR181MetaDataBuilder inspects java.* classes + * [JBWS-800] - ClassCastException when trying to marshal a subclass of Date + * [JBWS-810] - Simple type with restriction + * [JBWS-1184] - WSDL to Java - maps required xsd:double attribute to java.lang.Double + * [JBWS-1231] - wstools/java-wsdl does not handle recursive types + * [JBWS-1259] - WSDL To Java - StackOverflowError with self referencing element. + * [JBWS-1260] - WSDL To Java - Parameter unwrapping fails for a lot of scenarios. + * [JBWS-1285] - NPE when the soap encoded array size is 0 on the return path + * [JBWS-1317] - webservices.xml override does not account for namespaces + * [JBWS-1328] - Security configuration not correctly loaded when deployed as ear to JBoss 5.0.x + * [JBWS-1378] - NPE in replaceAddressLocation with SOAP1.2 WSDL + * [JBWS-1384] - Attachment parts with doclit message + * [JBWS-1386] - ComplexType with base64Binary property + * [JBWS-1393] - Problem interpreting messages with attachment when confronted with no <start> header + * [JBWS-1396] - Now jbossws-beans is exploded jbossws.sar must be exploded + * [JBWS-1408] - NPE when jbossws.sar is not expanded + * [JBWS-1410] - NumberFormatException From StubExt.PROPERTY_CLIENT_TIMEOUT + * [JBWS-1427] - Handling of invalid binding port type ref and doc/lit message parts + * [JBWS-1428] - Java to WSDL - Arrays defined with indexed properties within value type are skipped when generating the WSDL + * [JBWS-1441] - WSDL to Java - Complex type defined with complexContent only last element is in the generated java class if base type is empty + * [JBWS-1450] - WSDL To Java - Parameter unwrapping not handling nillable types correctly. + * [JBWS-1451] - comparison of the mime type should not be case sensitive + * [JBWS-1455] - WSDL To Java - Generated jaxrpc mapping contains same exception mapped multiple times if there are multiple operations. + * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x + * [JBWS-1497] - Fix failed resource lookup when offline + * [JBWS-1501] - wsimport RI fails when processing parameterOrder on one-way operations + + Errata ------ + FIXME: [JBWS-1294] Add support for mapping async methods + FIXME: [JBWS-1511] MessageFactory does not preserve comments + FIXME: [JBWS-434] Support sequences of anys in JAXRPC + FIXME: [JBWS-751] Multiple schema imports with the same namespace - Enjoy, The JBossWS Team Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-client-config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -10,13 +10,6 @@ </client-config> <client-config> - <config-name>Standard MTOM Client</config-name> - - <feature>http://org.jboss.ws/mtom</feature> - - </client-config> - - <client-config> <config-name>Standard WSAddressing Client</config-name> <post-handler-chains> <javaee:handler-chain> Modified: trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml =================================================================== --- trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/jbossws.sar/META-INF/standard-jaxws-endpoint-config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -10,14 +10,6 @@ </endpoint-config> <endpoint-config> - <config-name>Standard Endpoint</config-name> - - <feature>http://org.jboss.ws/mtom</feature> - - </endpoint-config> - - - <endpoint-config> <config-name>Standard WSAddressing Endpoint</config-name> <pre-handler-chains> <javaee:handler-chain> @@ -43,4 +35,4 @@ </pre-handler-chains> </endpoint-config> -</jaxws-config> \ No newline at end of file +</jaxws-config> Modified: trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/samples/ant-import/build-thirdparty.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -36,6 +36,7 @@ <get src="${jboss.repository}/jboss/ejb3/${jboss-ejb3}/bin/ejb3.deployer" dest="${thirdparty.dir}/ejb3.deployer.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossxb/${jboss-jbossxb}/lib/jboss-xml-binding.jar" dest="${thirdparty.dir}/jboss-xml-binding.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/security/${jboss-security}/lib/jbosssx-client.jar" dest="${thirdparty.dir}/jbosssx-client.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/jboss/jbossws-wsconsume-impl/${jbossws-wsconsume}/lib/jbossws-wsconsume-impl.jar" dest="${thirdparty.dir}/jbossws-wsconsume-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbossas/core-libs/${jbossas-core-libs}/lib/jboss-j2ee.jar" dest="${thirdparty.dir}/jboss-j2ee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jbpm/bpel/${jbpm-bpel}/lib/jbpm-bpel.sar" dest="${thirdparty.dir}/jbpm-bpel.sar" usetimestamp="true" verbose="true" /> <get src="${jboss.repository}/oswego-concurrent/${oswego-concurrent}/lib/concurrent.jar" dest="${thirdparty.dir}/concurrent.jar" usetimestamp="true" verbose="true"/> @@ -43,6 +44,7 @@ <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-javamail/${sun-javamail}/lib/mail.jar" dest="${thirdparty.dir}/mail.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> Modified: trunk/jbossws-core/src/main/resources/samples/build.xml =================================================================== --- trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/samples/build.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -31,7 +31,7 @@ <!-- JDK Detection --> <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - + <!-- Force thirdparty get --> <condition property="force.thirdparty.get"> <not> @@ -51,7 +51,7 @@ <!-- Available integration target --> <property name="integration.target.${jbossws.integration.target}" value="true"/> - + <!-- Define jboss.home --> <condition property="jboss.home" value="${jboss50.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -155,10 +155,10 @@ <pathelement location="${tests.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${tests.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${tests.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/> - <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/> - <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/> - <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss42-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-jboss40-integration.jar"/> + <pathelement location="${tests.lib.dir}/jbossws-tomcat-integration.jar"/> </path> <!-- The combined compile classpath --> @@ -191,11 +191,14 @@ <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/jboss.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <path refid="javac.classpath"/> </path> @@ -203,10 +206,10 @@ <path id="jbpm.bpel.classpath"> <path refid="jbossws.classpath"/> <pathelement location="${thirdparty.dir}/jbpm-bpel"/> <!-- jbpm.cfg.xml --> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar" /> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar"/> + <pathelement location="${thirdparty.dir}/jbpm-bpel/jaxen.jar"/> <pathelement location="${thirdparty.dir}/commons-collections.jar"/> <pathelement location="${thirdparty.dir}/commons-logging.jar"/> <pathelement location="${thirdparty.dir}/dom4j.jar"/> @@ -220,90 +223,35 @@ </target> <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> - <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> - - <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> + <pathelement location="${tomcat.home}/common/lib/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> </target> - <!-- ================================================================== --> - <!-- Compiling --> + <!-- Generating sources --> <!-- ================================================================== --> - <target name="compile" depends="compile14,compile15" description="Compile sources"/> - - <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/jaxws/**"/> - <exclude name="org/jboss/test/ws/tools/jsr181/**"/> - <classpath refid="javac.classpath"/> - </javac> + <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + </taskdef> + + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> - <target name="compile15" depends="init" if="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <target name="compile-generated" depends="init" description="Compile generated sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${tests.output.dir}/wstools/java"/> - <exclude name="org/jboss/test/ws/interop/**"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <target name="copy-resources" depends="init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> - <!-- Copy resources --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - <exclude name="jaxrpc/samples-override/**"/> - </fileset> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - <!-- Copy binary files --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> - <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - </target> - <!-- - Generate samples sources + Generate BPEL sources --> - <target name="generate-sources" depends="compile" description="Generate the deployment resources."> + <target name="servicegen" depends="compile" description="Generate the BPEL resources."> <!-- create jbpm process archives --> <mkdir dir="${tests.output.dir}/libs"/> <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> @@ -319,16 +267,25 @@ <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> + </target> + + <!-- + Generate JAX-RPC sources + --> + <target name="wstools" depends="compile" description="Generate the JAX-RPC artifacts."> - <!-- generate mapping artifacts --> + <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossretro-rt.jar"/> + <classpath location="${thirdparty.dir}/jboss-backport-concurrent.jar"/> <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> </taskdef> - <mkdir dir="${tests.output.dir}/libs"/> + + <!-- Generate JAX-RPC artifacts --> <mkdir dir="${tests.output.dir}/wstools/java"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> @@ -350,9 +307,7 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - </target> - - <target name="copy-generated" depends="init" description="Copy the deployment resources."> + <!-- Copy generated resources --> <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.output.dir}/wstools/resources"> @@ -369,7 +324,94 @@ </copy> </target> + <!-- + Generate JAX-WS sources + --> + <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> + + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + </target> + + <target name="generate-resources" depends="servicegen,wstools,wsprovide"> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src path="${tests.output.dir}/wstools/java"/> + <exclude name="org/jboss/test/ws/interop/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> + + <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${tests.java.dir}"/> + <exclude name="org/jboss/test/ws/jaxws/**"/> + <exclude name="org/jboss/test/ws/tools/jaxws/**"/> + <exclude name="org/jboss/test/ws/tools/jsr181/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <target name="compile15" depends="init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${tests.java.dir}"/> + <src path="${tests.output.dir}/wsconsume/java"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <!-- Copy resources --> + <target name="copy-resources" depends="init" description="Copy the deployment resources."> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> + + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + <exclude name="jaxrpc/samples-override/**"/> + </fileset> + <filterset> + <filter token="jbosstest.host.name" value="${node0}"/> + <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> + </filterset> + </copy> + + <!-- Copy binary files --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <exclude name="**/*.wsdl"/> + <exclude name="**/*.xml"/> + </fileset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="main" depends="wsconsume,compile,copy-resources,generate-resources" description="Build the deployments."> + <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + </target> + + <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> @@ -382,8 +424,8 @@ </target> <!-- - Run a collection of unit tests. - ant -Dtest=tools test + Run a collection of unit tests. + ant -Dtest=tools test --> <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-main"> @@ -427,8 +469,8 @@ </target> <!-- - Run a single unit test. - ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test + Run a single unit test. + ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> <mkdir dir="${tests.output.dir}/reports"/> Modified: trunk/jbossws-core/src/main/resources/samples/version.properties =================================================================== --- trunk/jbossws-core/src/main/resources/samples/version.properties 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-core/src/main/resources/samples/version.properties 2007-02-16 14:02:27 UTC (rev 2385) @@ -16,6 +16,7 @@ jboss-jbossxb=@jboss-jbossxb@ jboss-security=@jboss-security@ jbossas-core-libs=@jbossas-core-libs@ +jbossws-wsconsume=@jbossws-wsconsume@ oswego-concurrent=@oswego-concurrent@ stax-api=@stax-api@ sun-jaf=@sun-jaf@ Copied: trunk/jbossws-docs/user-guide/project/en/modules/wsbpel (from rev 2352, branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/wsbpel) Deleted: trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,336 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- $Id$ --> - -<chapter id="wsbpel"> - - <title>WS-BPEL</title> - - <para>This chapter is dedicated to show how to use <ulink - url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbp... to - specify business process behavior based on web services.</para> - - <section id="wsbpel.spec"> - - <title>Specification</title> - - <para>Originally authored by a reduced vendor charter, WS-BPEL is currently under - standardization at OASIS. The latest approved document as of August 22, 2006 is:</para> - - <para><ulink url="http://tinyurl.com/nw54b">Web Services Business Process Execution Language - 2.0 Committee Draft</ulink></para> - - <para>In the Java space, JSR-207 aims at defining metadata, interfaces and a runtime model - that enable business processes to be easily and rapidly implemented using Java and deployed - in J2EE containers. The request submission is:</para> - - <para><ulink url="http://jcp.org/en/jsr/detail?id=207">JSR 207: Process Definition for Java - </ulink></para> - - <para>The provided foundation would support tasks commonly encountered when programming - business processes such as parallel execution and asynchronous messaging.</para> - - </section> - - <section id="wsbpel.definition"> - - <title id="wsbpel.definition.title">Defining a business process</title> - - <para>Business processes model the stateful behavior of a participant in a business interaction. - In BPEL, a process exports and imports functionality to/from participants using web - service interfaces exclusively.</para> - - <para>At its simplest, BPEL can be used as a scripting language for web services. Consider - a trivial endpoint that receives a person name, composes a greeting phrase and then replies - with the greeting.</para> - - <para>The flow diagram below represents the processing logic.</para> - - <figure id="tutorial.hello.graph"> - <title>Graphical representation of the Hello World process</title> - <mediaobject> - <imageobject><imagedata align="center" fileref="images/wsbpel-hello.png"/></imageobject> - </mediaobject> - </figure> - - <para>The interface our endpoint presents to the world appears in the following WSDL document. - Observe no binding or service elements are present. A BPEL process is defined in terms - of the interfaces (message and port type elements) of the participants, not their possible - deployments.</para> - - <programlisting><![CDATA[<definitions targetNamespace="http://jbpm.org/examples/hello" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://jbpm.org/examples/hello" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <!-- carries the name of a person --> - <message name="NameMessage"> - <part name="name" type="xsd:string"/> - </message> - - <!-- carries the greeting --> - <message name="GreetingMessage"> - <part name="greeting" type="xsd:string"/> - </message> - - <!-- describes the interface presented to callers --> - <portType name="Greeter"> - <operation name="sayHello"> - <input message="tns:NameMessage"/> - <output message="tns:GreetingMessage"/> - </operation> - </portType> - -</definitions>]]></programlisting> - - <para>You already know how to implement this in Java. Let's jump to the BPEL way. The document - that defines our business process appears next. There are three major sections in it.</para> - - <itemizedlist> - - <listitem><para>The <literal>&lt;partnerLinks&gt;</literal> section lists the parties that - interact with the process in the course of greeting the world. The sole partner link shown - here corresponds to the agent sending the person name (the <emphasis>caller</emphasis>). - </para></listitem> - - <listitem><para>The <literal>&lt;variables&gt;</literal> section defines the data items held - by the process between message exchanges. The ability to mantain data effectively makes the - service provided by the process stateful. The state includes received and sent messages as - well as intermediate data used in business logic.</para></listitem> - - <listitem><para>The rest of the document describes the normal activities for handling a - greeting request. BPEL also provides the means to perform activities in response to faults. - Our trivial endpoint does not require them, tough.</para></listitem> - - </itemizedlist> - - <programlisting><![CDATA[<process name="HelloWorld" targetNamespace="http://jbpm.org/examples/hello" - xmlns="http://schemas.xmlsoap.org/ws/2003/03/business-process/" - xmlns:tns="http://jbpm.org/examples/hello" - xmlns:bpel="http://schemas.xmlsoap.org/ws/2003/03/business-process/&... - - <partnerLinks> - <!-- establishes the relationship with the caller agent --> - <partnerLink name="caller" partnerLinkType="tns:Greeter-Caller" myRole="Greeter" /> - </partnerLinks> - - <variables> - <!-- holds the incoming message --> - <variable name="request" messageType="tns:NameMessage" /> - <!-- holds the outgoing message --> - <variable name="response" messageType="tns:GreetingMessage" /> - </variables> - - <sequence> - - <!-- receive the name of a person --> - <receive operation="sayHello" partnerLink="caller" portType="tns:Greeter" - variable="request" createInstance="yes" /> - - <!-- compose a greeting phrase --> - <assign> - <copy> - <from expression="concat('Hello, ', - bpel:getVariableData('request', 'name'), - '!')" /> - <to variable="response" part="greeting" /> - </copy> - </assign> - - <!-- reply with the greeting --> - <reply operation="sayHello" partnerLink="caller" portType="tns:Greeter" - variable="response" /> - </sequence> - -</process>]]></programlisting> - - <para>Notice the <literal>caller</literal> partner link references a <literal>partnerLinkType - </literal> artifact not introduced so far. Partner link types are WSDL extensibility elements - that represent the relationship between two services. WS-BPEL uses them as the glue between - the process and its partner services.</para> - - <para>For the process definition to be complete, we add the partner link type to the WSDL - document presented earlier.</para> - - <programlisting><![CDATA[<definitions targetNamespace="http://jbpm.org/examples/hello" - ... - xmlns:plt="http://schemas.xmlsoap.org/ws/2003/05/partner-link/"... - - <!-- characterizes the relationship between the greeter and its caller --> - <plt:partnerLinkType name="Greeter-Caller"> - <plt:role name="Greeter"> - <plt:portType name="tns:Greeter"/> - </plt:role> - <!-- the Caller does not provide services to the Greeter, - this is why we omit the "Caller" role --> - </plt:partnerLinkType> - -</definitions>]]></programlisting> - - </section> - - <section id="wsbpel.database"> - - <title>Storing the process definition in the jBPM database</title> - - <para>In the domain of business processes, traceability is important. Process engines are - expected to maintain not only the current state of each process instance, but also the - history of performed activities and updated variables.</para> - - <para>To provide these features, the JBoss BPEL implementation builds on <ulink - url="http://www.jboss.com/products/jbpm">JBoss jBPM</ulink>. The Graph Oriented Programming - (<ulink url="http://jbpm.org/gop">GOP</ulink>) foundation in jBPM maintains past and present - graph state in a database.</para> - - <para>Installing the jBPM service in JBoss AS is a prerrequisite. The samples suite fetches - a preconfigured service archive from the JBoss repository and installs it automatically. - Please refer to the jBPM BPEL <ulink - url="http://docs.jboss.com/jbpm/bpel/getstarted.html#getstarted.setu... guide</ulink> - for details on how to customize the service to match your requirements and deployment - environment. The sample code that accompanies this chapter was developed and tested with - jBPM BPEL version 1.1.Beta2.</para> - - <note><para>The preconfigured jBPM service comes with an <ulink url="http://www.hsqldb.org/"> - HSQL</ulink> database, useful for development purposes. In production, you can switch to - the database of your choice.</para></note> - - <para>Before the process can serve requests, its definition must be stored in the jBPM database. - jBPM BPEL supplies an ant task, <literal>deployprocess</literal>, to assist here. The input of - <literal>deployprocess</literal> is a zip file containing your BPEL process and related WSDL - interfaces. The task submits the zip file to the jBPM service for storage.</para> - - <programlisting><![CDATA[<!-- Zip the BPEL process and related WSDL interfaces --> -<zip destfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip"> - <fileset dir="${build.test.dir}/resources/samples/wsbpel/hello/bpel" /> -</zip> - -<!-- Store the process definition in the jBPM database --> -<storeprocess processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip" />]]></programlisting> - - <para>The file <literal>bpel-definition.xml</literal> tells the location of the BPEL and WSDL - documents inside the archive.</para> - - <programlisting><![CDATA[<bpelDefinition location="hello.bpel" xmlns="http://jbpm.org/bpel"> - - <!-- makes WSDL interface elements available to the process --> - <imports> - <wsdl location="hello.wsdl" /> - </imports> - -</bpelDefinition>]]></programlisting> - - <tip><para>The definition descriptor can also reference external WSDL documents.</para></tip> - - </section> - - <section id="wsbpel.artifacts"> - - <title id="wsbpel.artifacts.title">Generating the required artifacts</title> - - <para>Deploying a BPEL process is similar to deploying a JSR-109 endpoint starting with WSDL. - </para> - - <para>The definition of a BPEL process only includes the port types of the participants, as - mentioned in <link linkend="wsbpel.definition" endterm="wsbpel.definition.title" />. On the - other hand, a JSR-109 deployment requires the presence of binding and service elements. JBoss - BPEL supplies a tool that generates SOAP 1.1 binding and service elements required for - deploying the web service provided by the process.</para> - - <programlisting><![CDATA[<!-- Define the servicegen ant task --> -<taskdef resource="org/jbpm/bpel/ant/tasks.properties" format="properties"> - <classpath> - <path location="${common.resources}" /> - <path refid="client.classpath" /> - <path location="${jboss.lib}/dom4j.jar" /> - <path location="${jboss.server.lib}/commons-collections.jar" /> - <path location="${jboss.server.deploy.jbpmbpel}" /> - <fileset dir="${jboss.server.deploy.jbpmbpel}"> - <include name="jbpm*.jar" /> - <include name="commons-lang*.jar" /> - <include name="jaxen*.jar" /> - </fileset> - </classpath> -</taskdef> - -<!-- Generate binding and service elements --> -<servicegen processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip" - outputdir="${build.test.dir}/wstools/resources/samples/wsbpel/hello/WEB-INF/wsdl" />]]></programlisting> - - <para>The generated WSDL can be passed to <literal>wstools</literal>. Use the following - configuration.</para> - - <programlisting><![CDATA[<configuration xmlns="http://www.jboss.org/jbossws-tools"> - <global> - <package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello" - namespace="http://jbpm.org/examples/hello" /> - </global> - <wsdl-java file="wstools/resources/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> -</configuration>]]></programlisting> - - <note> - - <para>JBoss BPEL does not use the Java mapping artifacts that <literal>wstools</literal> - produces. Keep in mind that variables in a BPEL process are defined in terms of XML types - and WSDL messages. JBoss BPEL extracts XML content from SOAP messages and places it in the - process variables directly.</para> - - <para>Nevertheless, the Java mapping artifacts still must be present for the JSR-109 - deployment to be valid. Note that the supplied service implementation bean has empty methods - only. The BPEL process specifies the behavior instead.</para> - - </note> - - </section> - - <section id="wsbpel.config"> - - <title>Configuring the port component</title> - - <para>Similar to the Addressing and Security components, JBoss BPEL uses a <link - linkend="handlers">JAX-RPC handler</link> to extract XML content from SOAP messages.</para> - - <programlisting><![CDATA[<handler> - - <handler-name>GreeterSoapHandler</handler-name> - <handler-class>org.jbpm.bpel.integration.server.SoapHandler</handler-class> - - <init-param> - <description>name of the partner link served by this port</description> - <param-name>partnerLinkHandle</param-name> - <param-value>caller</param-value> - </init-param> - -</handler>]]></programlisting> - - <para>A separate descriptor, <literal>bpel-application.xml</literal>, specifies the name of - the process definition.</para> - - <programlisting>&lt;bpelApplication name=&quot;HelloWorld&quot; xmlns=&quot;http://jbpm.org/bpel&quot; /&gt;</programlisting> - - <note><para>This name will be used to retrieve the process definition from the jBPM database.</para></note> - - </section> - - <section id="wsbpel.client"> - - <title>Consuming the published web service</title> - - <para>No special configuration is needed on the client side. You consume a service provided by - a WS-BPEL process the same way you consume any other service.</para> - - <para>You can reuse the Java mapping artifacts produced in <link linkend="wsbpel.artifacts" - endterm="wsbpel.artifacts.title" /> to develop a <link linkend="jsr109-clients">JSR-109 client - </link>.</para> - - <programlisting><![CDATA[InitialContext iniCtx = getInitialContext(); -service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); - -Greeter proxy = service.getGreeterPort(); -String greeting = proxy.sayHello("Popeye"); -assertEquals("Hello, Popeye!", greeting);]]></programlisting> - - </section> - -</chapter> \ No newline at end of file Copied: trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml) =================================================================== --- trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml (rev 0) +++ trunk/jbossws-docs/user-guide/project/en/modules/wsbpel/wsbpel.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,336 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- $Id$ --> + +<chapter id="wsbpel"> + + <title>WS-BPEL</title> + + <para>This chapter is dedicated to show how to use <ulink + url="http://www.oasis-open.org/committees/tc_home.php?wg_abbrev=wsbp... to + specify business process behavior based on web services.</para> + + <section id="wsbpel.spec"> + + <title>Specification</title> + + <para>Originally authored by a reduced vendor charter, WS-BPEL is currently under + standardization at OASIS. The latest approved document as of August 22, 2006 is:</para> + + <para><ulink url="http://tinyurl.com/nw54b">Web Services Business Process Execution Language + 2.0 Committee Draft</ulink></para> + + <para>In the Java space, JSR-207 aims at defining metadata, interfaces and a runtime model + that enable business processes to be easily and rapidly implemented using Java and deployed + in J2EE containers. The request submission is:</para> + + <para><ulink url="http://jcp.org/en/jsr/detail?id=207">JSR 207: Process Definition for Java + </ulink></para> + + <para>The provided foundation would support tasks commonly encountered when programming + business processes such as parallel execution and asynchronous messaging.</para> + + </section> + + <section id="wsbpel.definition"> + + <title id="wsbpel.definition.title">Defining a business process</title> + + <para>Business processes model the stateful behavior of a participant in a business interaction. + In BPEL, a process exports and imports functionality to/from participants using web + service interfaces exclusively.</para> + + <para>At its simplest, BPEL can be used as a scripting language for web services. Consider + a trivial endpoint that receives a person name, composes a greeting phrase and then replies + with the greeting.</para> + + <para>The flow diagram below represents the processing logic.</para> + + <figure id="tutorial.hello.graph"> + <title>Graphical representation of the Hello World process</title> + <mediaobject> + <imageobject><imagedata align="center" fileref="images/wsbpel-hello.png"/></imageobject> + </mediaobject> + </figure> + + <para>The interface our endpoint presents to the world appears in the following WSDL document. + Observe no binding or service elements are present. A BPEL process is defined in terms + of the interfaces (message and port type elements) of the participants, not their possible + deployments.</para> + + <programlisting><![CDATA[<definitions targetNamespace="http://jbpm.org/examples/hello" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://jbpm.org/examples/hello" + xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + + <!-- carries the name of a person --> + <message name="NameMessage"> + <part name="name" type="xsd:string"/> + </message> + + <!-- carries the greeting --> + <message name="GreetingMessage"> + <part name="greeting" type="xsd:string"/> + </message> + + <!-- describes the interface presented to callers --> + <portType name="Greeter"> + <operation name="sayHello"> + <input message="tns:NameMessage"/> + <output message="tns:GreetingMessage"/> + </operation> + </portType> + +</definitions>]]></programlisting> + + <para>You already know how to implement this in Java. Let's jump to the BPEL way. The document + that defines our business process appears next. There are three major sections in it.</para> + + <itemizedlist> + + <listitem><para>The <literal>&lt;partnerLinks&gt;</literal> section lists the parties that + interact with the process in the course of greeting the world. The sole partner link shown + here corresponds to the agent sending the person name (the <emphasis>caller</emphasis>). + </para></listitem> + + <listitem><para>The <literal>&lt;variables&gt;</literal> section defines the data items held + by the process between message exchanges. The ability to mantain data effectively makes the + service provided by the process stateful. The state includes received and sent messages as + well as intermediate data used in business logic.</para></listitem> + + <listitem><para>The rest of the document describes the normal activities for handling a + greeting request. BPEL also provides the means to perform activities in response to faults. + Our trivial endpoint does not require them, tough.</para></listitem> + + </itemizedlist> + + <programlisting><![CDATA[<process name="HelloWorld" targetNamespace="http://jbpm.org/examples/hello" + xmlns="http://schemas.xmlsoap.org/ws/2003/03/business-process/" + xmlns:tns="http://jbpm.org/examples/hello" + xmlns:bpel="http://schemas.xmlsoap.org/ws/2003/03/business-process/&... + + <partnerLinks> + <!-- establishes the relationship with the caller agent --> + <partnerLink name="caller" partnerLinkType="tns:Greeter-Caller" myRole="Greeter" /> + </partnerLinks> + + <variables> + <!-- holds the incoming message --> + <variable name="request" messageType="tns:NameMessage" /> + <!-- holds the outgoing message --> + <variable name="response" messageType="tns:GreetingMessage" /> + </variables> + + <sequence> + + <!-- receive the name of a person --> + <receive operation="sayHello" partnerLink="caller" portType="tns:Greeter" + variable="request" createInstance="yes" /> + + <!-- compose a greeting phrase --> + <assign> + <copy> + <from expression="concat('Hello, ', + bpel:getVariableData('request', 'name'), + '!')" /> + <to variable="response" part="greeting" /> + </copy> + </assign> + + <!-- reply with the greeting --> + <reply operation="sayHello" partnerLink="caller" portType="tns:Greeter" + variable="response" /> + </sequence> + +</process>]]></programlisting> + + <para>Notice the <literal>caller</literal> partner link references a <literal>partnerLinkType + </literal> artifact not introduced so far. Partner link types are WSDL extensibility elements + that represent the relationship between two services. WS-BPEL uses them as the glue between + the process and its partner services.</para> + + <para>For the process definition to be complete, we add the partner link type to the WSDL + document presented earlier.</para> + + <programlisting><![CDATA[<definitions targetNamespace="http://jbpm.org/examples/hello" + ... + xmlns:plt="http://schemas.xmlsoap.org/ws/2003/05/partner-link/"... + + <!-- characterizes the relationship between the greeter and its caller --> + <plt:partnerLinkType name="Greeter-Caller"> + <plt:role name="Greeter"> + <plt:portType name="tns:Greeter"/> + </plt:role> + <!-- the Caller does not provide services to the Greeter, + this is why we omit the "Caller" role --> + </plt:partnerLinkType> + +</definitions>]]></programlisting> + + </section> + + <section id="wsbpel.database"> + + <title>Storing the process definition in the jBPM database</title> + + <para>In the domain of business processes, traceability is important. Process engines are + expected to maintain not only the current state of each process instance, but also the + history of performed activities and updated variables.</para> + + <para>To provide these features, the JBoss BPEL implementation builds on <ulink + url="http://www.jboss.com/products/jbpm">JBoss jBPM</ulink>. The Graph Oriented Programming + (<ulink url="http://jbpm.org/gop">GOP</ulink>) foundation in jBPM maintains past and present + graph state in a database.</para> + + <para>Installing the jBPM service in JBoss AS is a prerrequisite. The samples suite fetches + a preconfigured service archive from the JBoss repository and installs it automatically. + Please refer to the jBPM BPEL <ulink + url="http://docs.jboss.com/jbpm/bpel/getstarted.html#getstarted.setu... guide</ulink> + for details on how to customize the service to match your requirements and deployment + environment. The sample code that accompanies this chapter was developed and tested with + jBPM BPEL version 1.1.Beta2.</para> + + <note><para>The preconfigured jBPM service comes with an <ulink url="http://www.hsqldb.org/"> + HSQL</ulink> database, useful for development purposes. In production, you can switch to + the database of your choice.</para></note> + + <para>Before the process can serve requests, its definition must be stored in the jBPM database. + jBPM BPEL supplies an ant task, <literal>deployprocess</literal>, to assist here. The input of + <literal>deployprocess</literal> is a zip file containing your BPEL process and related WSDL + interfaces. The task submits the zip file to the jBPM service for storage.</para> + + <programlisting><![CDATA[<!-- Zip the BPEL process and related WSDL interfaces --> +<zip destfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip"> + <fileset dir="${build.test.dir}/resources/samples/wsbpel/hello/bpel" /> +</zip> + +<!-- Store the process definition in the jBPM database --> +<storeprocess processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip" />]]></programlisting> + + <para>The file <literal>bpel-definition.xml</literal> tells the location of the BPEL and WSDL + documents inside the archive.</para> + + <programlisting><![CDATA[<bpelDefinition location="hello.bpel" xmlns="http://jbpm.org/bpel"> + + <!-- makes WSDL interface elements available to the process --> + <imports> + <wsdl location="hello.wsdl" /> + </imports> + +</bpelDefinition>]]></programlisting> + + <tip><para>The definition descriptor can also reference external WSDL documents.</para></tip> + + </section> + + <section id="wsbpel.artifacts"> + + <title id="wsbpel.artifacts.title">Generating the required artifacts</title> + + <para>Deploying a BPEL process is similar to deploying a JSR-109 endpoint starting with WSDL. + </para> + + <para>The definition of a BPEL process only includes the port types of the participants, as + mentioned in <link linkend="wsbpel.definition" endterm="wsbpel.definition.title" />. On the + other hand, a JSR-109 deployment requires the presence of binding and service elements. JBoss + BPEL supplies a tool that generates SOAP 1.1 binding and service elements required for + deploying the web service provided by the process.</para> + + <programlisting><![CDATA[<!-- Define the servicegen ant task --> +<taskdef resource="org/jbpm/bpel/ant/tasks.properties" format="properties"> + <classpath> + <path location="${common.resources}" /> + <path refid="client.classpath" /> + <path location="${jboss.lib}/dom4j.jar" /> + <path location="${jboss.server.lib}/commons-collections.jar" /> + <path location="${jboss.server.deploy.jbpmbpel}" /> + <fileset dir="${jboss.server.deploy.jbpmbpel}"> + <include name="jbpm*.jar" /> + <include name="commons-lang*.jar" /> + <include name="jaxen*.jar" /> + </fileset> + </classpath> +</taskdef> + +<!-- Generate binding and service elements --> +<servicegen processfile="${build.test.dir}/libs/jbossws-samples-wsbpel-hello-process.zip" + outputdir="${build.test.dir}/wstools/resources/samples/wsbpel/hello/WEB-INF/wsdl" />]]></programlisting> + + <para>The generated WSDL can be passed to <literal>wstools</literal>. Use the following + configuration.</para> + + <programlisting><![CDATA[<configuration xmlns="http://www.jboss.org/jbossws-tools"> + <global> + <package-namespace package="org.jboss.test.ws.jaxrpc.samples.wsbpel.hello" + namespace="http://jbpm.org/examples/hello" /> + </global> + <wsdl-java file="wstools/resources/samples/wsbpel/hello/WEB-INF/wsdl/service.wsdl"> + <mapping file="jaxrpc-mapping.xml" /> + </wsdl-java> +</configuration>]]></programlisting> + + <note> + + <para>JBoss BPEL does not use the Java mapping artifacts that <literal>wstools</literal> + produces. Keep in mind that variables in a BPEL process are defined in terms of XML types + and WSDL messages. JBoss BPEL extracts XML content from SOAP messages and places it in the + process variables directly.</para> + + <para>Nevertheless, the Java mapping artifacts still must be present for the JSR-109 + deployment to be valid. Note that the supplied service implementation bean has empty methods + only. The BPEL process specifies the behavior instead.</para> + + </note> + + </section> + + <section id="wsbpel.config"> + + <title>Configuring the port component</title> + + <para>Similar to the Addressing and Security components, JBoss BPEL uses a <link + linkend="handlers">JAX-RPC handler</link> to extract XML content from SOAP messages.</para> + + <programlisting><![CDATA[<handler> + + <handler-name>GreeterSoapHandler</handler-name> + <handler-class>org.jbpm.bpel.integration.server.SoapHandler</handler-class> + + <init-param> + <description>name of the partner link served by this port</description> + <param-name>partnerLinkHandle</param-name> + <param-value>caller</param-value> + </init-param> + +</handler>]]></programlisting> + + <para>A separate descriptor, <literal>bpel-application.xml</literal>, specifies the name of + the process definition.</para> + + <programlisting>&lt;bpelApplication name=&quot;HelloWorld&quot; xmlns=&quot;http://jbpm.org/bpel&quot; /&gt;</programlisting> + + <note><para>This name will be used to retrieve the process definition from the jBPM database.</para></note> + + </section> + + <section id="wsbpel.client"> + + <title>Consuming the published web service</title> + + <para>No special configuration is needed on the client side. You consume a service provided by + a WS-BPEL process the same way you consume any other service.</para> + + <para>You can reuse the Java mapping artifacts produced in <link linkend="wsbpel.artifacts" + endterm="wsbpel.artifacts.title" /> to develop a <link linkend="jsr109-clients">JSR-109 client + </link>.</para> + + <programlisting><![CDATA[InitialContext iniCtx = getInitialContext(); +service = (HelloWorldService)iniCtx.lookup("java:comp/env/service/BpelHello"); + +Greeter proxy = service.getGreeterPort(); +String greeting = proxy.sayHello("Popeye"); +assertEquals("Hello, Popeye!", greeting);]]></programlisting> + + </section> + +</chapter> \ No newline at end of file Modified: trunk/jbossws-tests/.classpath =================================================================== --- trunk/jbossws-tests/.classpath 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/.classpath 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="org/jboss/test/ws/interop/|org/jboss/test/ws/jaxrpc/jbws718/" kind="src" path="src/main/java"/> + <classpathentry kind="src" path="output/wsconsume/java"/> <classpathentry kind="src" path="output/wstools/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> Modified: trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/ant-import/build-jars-jaxrpc.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -2673,7 +2673,7 @@ </metainf> </jar> - <!-- jaxrpc-wsse-simple-sign-encrypt.war --> + <!-- jaxrpc-wsse-simple-sign-encrypt --> <war warfile="${tests.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${tests.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> @@ -2903,6 +2903,126 @@ </metainf> </jar> + <!-- jaxrpc-xop-doclit without handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + + <!-- jaxrpc-xop-doclit with handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + + <!-- jaxrpc-xop-rpclit without handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="webservices.xml"/> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + + <!-- jaxrpc-xop-rpclit with handlers --> + <war warfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="jaxrpc-mapping.xml"/> + <include name="wsdl/**"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> + <include name="webservices.xml"/> + </webinf> + </war> + <jar destfile="${tests.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> + <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> + <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> + </fileset> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> + <include name="application-client.xml"/> + <include name="jboss-client.xml"/> + </metainf> + <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <include name="wsdl/**"/> + <include name="jaxrpc-mapping.xml"/> + </metainf> + </jar> + <!-- Please add alphabetically --> </target> Modified: trunk/jbossws-tests/ant-import/build-jars-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/ant-import/build-jars-jaxws.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -193,6 +193,7 @@ <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/jsr181/complex/*TestCase.class"/> </classes> </war> @@ -207,126 +208,6 @@ </webinf> </war> - <!-- jaxws-webserviceref --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> - </classes> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> - </manifest> - </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss-web.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-ejb3-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Remote.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="jboss.xml"/> - <include name="wsdl/**"/> - </metainf> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointImpl.class"/> - </fileset> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-secure-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointClient.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/SecureEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-secure"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.SecureEndpointClient"/> - </manifest> - </jar> - <jar destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-override-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientTwo.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> - <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF-override"> - <include name="jbossws-client-config.xml"/> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> - <include name="wsdl/**"/> - </metainf> - <manifest> - <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientTwo"/> - </manifest> - </jar> - - <!-- jaxws-samples-wsaddressing --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> - <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF"> - <include name="jaxws-handlers.xml"/> - </webinf> - </war> - - <!-- jaxws-samples-wseventing.war --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-wseventing.war" webxml="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/wseventing/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/wseventing/WEB-INF"> - <include name="wsdl/jboss-web.xml"/> - <include name="wsdl/sysmon.wsdl"/> - <include name="wsdl/ws-eventing.wsdl"/> - <include name="wsdl/ws-eventing.xsd"/> - <include name="wsdl/ws-addr.xsd"/> - </webinf> - </war> - - <!-- jaxws-samples-xop-doclit --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/> - </fileset> - </jar> - <!-- jaxws-wrapped-accessor --> <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/ant-import/build-samples-jaxrpc.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -627,126 +627,6 @@ </metainf> </jar> - <!-- jaxrpc-samples-xop-doclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-xop-doclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-doclit_handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-xop-rpclit without handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="webservices.xml"/> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - - <!-- jaxrpc-samples-xop-rpclit with handlers --> - <war warfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler.war" webxml="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </classes> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="jaxrpc-mapping.xml"/> - <include name="wsdl/**"/> - </webinf> - <webinf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> - <include name="webservices.xml"/> - </webinf> - </war> - <jar destfile="${tests.output.dir}/libs/jaxrpc-samples-xop-rpclit_handler-client.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> - <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> - <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> - </fileset> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> - <include name="application-client.xml"/> - <include name="jboss-client.xml"/> - </metainf> - <metainf dir="${tests.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> - <include name="wsdl/**"/> - <include name="jaxrpc-mapping.xml"/> - </metainf> - </jar> - <!-- Please add alphabetically --> </target> Modified: trunk/jbossws-tests/ant-import/build-samples-jaxws.xml =================================================================== --- trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/ant-import/build-samples-jaxws.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -407,12 +407,45 @@ </webinf> </war> + <!-- jaxws-samples-wssecurity-encrypt --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-encrypt.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + + <!-- jaxws-samples-wssecurity-sign --> + <war warfile="${tests.output.dir}/libs/jaxws-samples-wssecurity-sign.war" webxml="${tests.output.dir}/resources/jaxws/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/Hello.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.class"/> + <include name="org/jboss/test/ws/jaxws/samples/wssecurity/UserType.class"/> + </classes> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF"> + <include name="jboss-wsse-server.xml"/> + </webinf> + <webinf dir="${tests.output.dir}/resources/jaxws/samples/wssecurity"> + <include name="wsse.keystore"/> + <include name="wsse.truststore"/> + </webinf> + </war> + <!-- jaxws-samples-xop-doclit --> - <jar jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/**/*.class"/> - </fileset> - </jar> + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <classes dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> + <exclude name="org/jboss/test/ws/jaxws/samples/xop/doclit/*TestCase.class"/> + </classes> + </war> <!-- Please add alphabetically --> Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/build.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -9,7 +9,7 @@ <!-- $Id$ --> <project default="main" basedir="../jbossws-tests" name="JBossWS-Tests"> - + <import file="${basedir}/../build/ant-import/build-thirdparty.xml"/> <import file="${basedir}/../build/ant-import/build-setup.xml"/> <import file="${basedir}/../integration-jboss50/build.xml"/> @@ -18,22 +18,21 @@ <import file="${basedir}/../integration-tomcat/build.xml"/> <import file="${basedir}/../jbossws-core/build.xml"/> <import file="${basedir}/../jbossws-tests/ant-import/build-benchmark.xml"/> - <import file="${basedir}/../jbossws-tests/ant-import/jaxws-tools-delegate.xml"/> - + <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.classes.dir" value="${core.output.dir}/classes"/> <property name="core.output.classes14.dir" value="${core.output.dir}/classes14"/> <property name="core.output.lib.dir" value="${core.output.dir}/lib"/> - + <property name="tests.etc.dir" value="${tests.dir}/src/main/etc"/> <property name="tests.java.dir" value="${tests.dir}/src/main/java"/> <property name="tests.resources.dir" value="${tests.dir}/src/main/resources"/> <property name="tests.output.dir" value="${tests.dir}/output"/> - + <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - + <!-- Use -Ddebug=true for remote debugging --> <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"> <isset property="debug"/> @@ -43,10 +42,10 @@ <isset property="debug"/> </not> </condition> - + <!-- Available integration target --> <property name="integration.target.${jbossws.integration.target}" value="true"/> - + <!-- Define jboss.home --> <condition property="jboss.home" value="${jboss50.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> @@ -57,7 +56,7 @@ <condition property="jboss.home" value="${jboss40.home}"> <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> </condition> - + <!-- Integration Target Server --> <condition property="jbossws.integration.target.jboss"> <isset property="jboss.home"/> @@ -65,13 +64,13 @@ <condition property="jbossws.integration.target.tomcat"> <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> </condition> - + <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> - + <!-- Java Endorsed --> <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> <isset property="jbossws.integration.target.jboss"/> @@ -79,7 +78,7 @@ <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> <isset property="jbossws.integration.target.tomcat"/> </condition> - + <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME otherwise and initialize the node0/node1 cluster hostnames to localhost and ${hostname} by default. If you cannot route multicast traffic between @@ -96,26 +95,26 @@ <os family="windows"/> </not> </condition> - + <!-- node0 defaults --> <property name="node0" value="localhost"/> <property name="node0.http.url" value="http://${node0}:8080"/> <property name="node0.jndi.url" value="jnp://${node0}:1099"/> <property name="node0.hajndi.url" value="jnp://${node0}:1100"/> - + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - + <target name="prepare"> - + <mkdir dir="${tests.output.dir}/log"/> <touch file="${tests.output.dir}/log/test.log"/> - + <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> </tstamp> - + <!-- Define excluded tests --> <condition property="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"> <or> @@ -125,7 +124,7 @@ </condition> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-noejb3-excludes.txt"/> <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> - + <echo/> <echo message="-----------------------------------------------"/> <echo message="jboss.home = ${jboss.home}"/> @@ -134,16 +133,16 @@ <echo message="endorsed = ${endorsed.dirs}"/> <echo message="excludesfile = ${excludes-short-name}"/> <echo message="-----------------------------------------------"/> - + </target> - + <!-- Init the various classpaths --> <target name="init" depends="prepare,jboss-classpath,tomcat-classpath"/> - + <target name="common-classpath" depends="prepare,thirdparty"> - + <condition property="jbossws.classpath" value="jbossws.classpath.jdk15"> <isset property="HAVE_JDK_1.5"/> </condition> @@ -155,12 +154,11 @@ <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-jaxws.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> - <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/> - <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/> - <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/> - <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${jboss50.output.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${jboss42.output.lib.dir}/jbossws-jboss42-integration.jar"/> + <pathelement location="${jboss40.output.lib.dir}/jbossws-jboss40-integration.jar"/> + <pathelement location="${tomcat.output.lib.dir}/jbossws-tomcat-integration.jar"/> </path> - <path id="jbossws.classpath.jdk14"> <pathelement location="${core.output.lib.dir}/jboss-jaxrpc.jar"/> <pathelement location="${core.output.lib.dir}/jboss-saaj.jar"/> @@ -186,9 +184,9 @@ <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> </path> </target> - + <target name="jboss-classpath" depends="common-classpath" if="jbossws.integration.target.jboss"> - + <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.classpath"/> @@ -200,14 +198,17 @@ <pathelement location="${jboss.client}/jbossretro-rt.jar"/> <pathelement location="${jboss.client}/log4j.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> - <pathelement location="${jboss.lib}/jboss-vfs.jar"/> + <pathelement location="${jboss.lib}/jboss-vfs.jar"/> <pathelement location="${jboss.server.lib}/hibernate3.jar"/> - <pathelement location="${jboss.server.lib}/jboss.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/jboss.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.lib}/jbosssx.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> + <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> <path refid="javac.classpath"/> </path> - + <!-- The jBPM BPEL classpath --> <path id="jbpm.bpel.classpath"> <path refid="jbossws.classpath"/> @@ -227,131 +228,60 @@ --> </path> </target> - + <target name="tomcat-classpath" depends="common-classpath" if="jbossws.integration.target.tomcat"> - <fail message="jdk-1.5 is required for Tomcat integration" unless="HAVE_JDK_1.5"/> - - <!-- The test client classpath --> <path id="test.client.classpath"> <path refid="jbossws.classpath"/> - <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> + <pathelement location="${tomcat.common.lib}/jbossws-thirdparty.jar"/> <path refid="javac.classpath"/> </path> </target> - - + <!-- ================================================================== --> - <!-- Compiling --> + <!-- Generating sources --> <!-- ================================================================== --> - - <target name="compile" depends="wsdl-java,compile14,compile15" description="Compile sources"/> - - <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/jaxws/**"/> - <exclude name="org/jboss/test/ws/tools/jsr181/**"/> - <classpath refid="javac.classpath"/> - </javac> + + <target name="wsconsume" depends="init" description="Consume JAX-WS contracts" if="HAVE_JDK_1.5"> + + <!-- Define the JAX-WS wsconsume task --> + <taskdef name="wsconsume" classname="org.jboss.ws.tools.jaxws.ant.wsconsume"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/jbossws-wsconsume-impl.jar"/> + <classpath location="${thirdparty.dir}/jaxb-xjc.jar"/> + </taskdef> + + <wsconsume wsdl="${tests.resources.dir}/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl" package="org.jboss.test.ws.jaxws.samples.wssecurity" sourcedestdir="${tests.output.dir}/wsconsume/java" keep="true"/> </target> - - <target name="compile15" depends="init" if="HAVE_JDK_1.5"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" - failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> - <src path="${tests.java.dir}"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <target name="post-compile" depends="init" description="Compile generated sources"> - <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${tests.output.dir}/wstools/java"/> - <exclude name="org/jboss/test/ws/interop/microsoft/**"/> - <classpath refid="javac.classpath"/> - </javac> - </target> - - <target name="copy-resources" depends="init" description="Copy the deployment resources."> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> - <!-- Copy resources --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <include name="**/*.wsdl"/> - <include name="**/*.xml"/> - <exclude name="jaxrpc/samples-override/**"/> - </fileset> - <filterset> - <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> - </filterset> - </copy> - <!-- Copy binary files --> - <copy todir="${tests.output.dir}/resources"> - <fileset dir="${tests.resources.dir}"> - <exclude name="**/*.wsdl"/> - <exclude name="**/*.xml"/> - </fileset> - </copy> - </target> - - <!-- ================================================================== --> - <!-- Building --> - <!-- ================================================================== --> - - <target name="main" depends="compile,copy-resources,java-wsdl,post-compile,copy-generated" description="Build the deployments."> - <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> - <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - + <!-- - Create artifacts that need to be compiled with the test cases + Generate BPEL sources --> - <target name="wsdl-java" depends="init"> - <!-- interop --> - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitB/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitb" verbose="false"/> - - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesDocLitW/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.basedoclitw" verbose="false"/> - - <call-wsconsume wsdlLocation="${tests.resources.dir}/interop/soapwsdl/BaseDataTypesRpcLit/WEB-INF/wsdl/service.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.interop.soapwsdl.baserpclit" verbose="false"/> - - <!-- benchmark --> - <call-wsconsume wsdlLocation="${tests.resources.dir}/benchmark/jaxws/doclit/WEB-INF/wsdl/BenchmarkWebService.wsdl" sourceDir="${tests.output.dir}/wstools/java" - destDir="${tests.output.dir}/classes" package="org.jboss.test.ws.benchmark.jaxws.doclit" verbose="false"/> - </target> - - <!-- - Create artifacts that depend on pre-compiled sources - --> - <target name="java-wsdl" depends="compile" description="Generate the deployment resources."> - + <target name="servicegen" depends="compile" description="Generate the BPEL resources."> <!-- create jbpm process archives --> - <mkdir dir="${tests.output.dir}/libs"/> + <mkdir dir="${tests.output.dir}/libs"/> <zip destfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip"> <fileset dir="${tests.resources.dir}/jaxrpc/samples/wsbpel/hello/bpel" /> </zip> <!-- Copy the BPEL sar --> <copy file="${thirdparty.dir}/jbpm-bpel.sar" todir="${tests.output.dir}/libs"/> - <!-- generate wsdl binding and service definitions for bpel processes --> + <!-- generate wsdl binding and service definitions for bpel processes --> <taskdef name="servicegen" classname="org.jbpm.bpel.ant.ServiceGeneratorTask"> <classpath refid="jbpm.bpel.classpath"/> </taskdef> <servicegen processfile="${tests.output.dir}/libs/jaxrpc-samples-wsbpel-hello-process.zip" outputdir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF/wsdl" bindingfile="hello-binding-.wsdl" servicefile="hello-service.wsdl" /> - - <!-- generate mapping artifacts --> + </target> + + <!-- + Generate JAX-RPC sources + --> + <target name="wstools" depends="compile" description="Generate the JAX-RPC artifacts."> + + <!-- Define the JAX-RPC tools task --> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="core.classpath"/> <classpath refid="jbossws.classpath"/> @@ -360,9 +290,9 @@ <classpath location="${thirdparty.dir}/concurrent.jar"/> <classpath location="${tests.output.dir}/classes"/> <classpath location="${tests.output.dir}"/> - </taskdef> - - <mkdir dir="${tests.output.dir}/libs"/> + </taskdef> + + <!-- Generate JAX-RPC artifacts --> <mkdir dir="${tests.output.dir}/wstools/java"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> <wstools dest="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${tests.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> @@ -384,9 +314,7 @@ <move todir="${tests.output.dir}/wstools/java"> <fileset dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> - </target> - - <target name="copy-generated" depends="init" description="Copy the deployment resources."> + <!-- Copy generated resources --> <copy todir="${tests.output.dir}/resources"> <fileset dir="${tests.output.dir}/wstools/resources"> @@ -402,11 +330,100 @@ </filterset> </copy> </target> - + + <!-- + Generate JAX-WS sources + --> + <target name="wsprovide" depends="compile" description="Provide the JAX-WS contracts." if="HAVE_JDK_1.5"> + + <!-- Define the JAX-WS wsprovide task --> + <taskdef name="wsprovide" classname="org.jboss.ws.tools.jaxws.ant.wsprovide"> + <classpath refid="core.classpath"/> + <classpath refid="jbossws.classpath"/> + <classpath location="${thirdparty.dir}/concurrent.jar"/> + <classpath location="${tests.output.dir}/classes"/> + </taskdef> + + <wsprovide resourcedestdir="${tests.output.dir}/wsprovide/resources/jaxws/samples/wssecurity" genwsdl="true" sei="org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean"/> + </target> + + <target name="generate-resources" depends="servicegen,wstools,wsprovide"> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src path="${tests.output.dir}/wstools/java"/> + <exclude name="org/jboss/test/ws/interop/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + <!-- ================================================================== --> + <!-- Compiling --> + <!-- ================================================================== --> + + <target name="compile" depends="wsconsume,compile14,compile15" description="Compile sources"/> + + <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${tests.java.dir}"/> + <exclude name="org/jboss/test/ws/jaxws/**"/> + <exclude name="org/jboss/test/ws/tools/jaxws/**"/> + <exclude name="org/jboss/test/ws/tools/jsr181/**"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <target name="compile15" depends="init" if="HAVE_JDK_1.5"> + <mkdir dir="${tests.output.dir}/classes"/> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> + <src path="${tests.java.dir}"/> + <src path="${tests.output.dir}/wsconsume/java"/> + <classpath refid="javac.classpath"/> + </javac> + </target> + + <!-- Copy resources --> + <target name="copy-resources" depends="init" description="Copy the deployment resources."> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> + + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <include name="**/*.wsdl"/> + <include name="**/*.xml"/> + <exclude name="jaxrpc/samples-override/**"/> + </fileset> + <filterset> + <filter token="jbosstest.host.name" value="${node0}"/> + <filter token="wsdl-publish-location" value="${tests.output.dir}/wsdl-publish"/> + </filterset> + </copy> + + <!-- Copy binary files --> + <copy todir="${tests.output.dir}/resources"> + <fileset dir="${tests.resources.dir}"> + <exclude name="**/*.wsdl"/> + <exclude name="**/*.xml"/> + </fileset> + </copy> + </target> + + <!-- ================================================================== --> + <!-- Building --> + <!-- ================================================================== --> + + <target name="main" depends="wsconsume,compile,copy-resources,generate-resources" description="Build the deployments."> + <ant antfile="${basedir}/ant-import/build-samples-jaxrpc.xml" target="build-samples-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-samples-jaxws.xml" target="build-samples-jaxws" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-jars-jaxrpc.xml" target="build-jars-jaxrpc" inheritall="true"/> + <ant antfile="${basedir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <!-- ================================================================== --> <!-- Testing --> <!-- ================================================================== --> - + <!-- Run all unit tests and generate a report --> <target name="tests" depends="main" description="Run all unit tests and generate a report"> <antcall target="tests-main"> @@ -414,7 +431,7 @@ </antcall> <antcall target="tests-report"/> </target> - + <!-- Run samples test cases --> <target name="tests-samples" depends="init" description="Run samples unit tests"> <antcall target="tests-main"> @@ -422,7 +439,7 @@ </antcall> <antcall target="tests-report"/> </target> - + <!-- Run tools test cases --> <target name="tests-tools" depends="init" description="Run tools unit tests"> <antcall target="tests-main"> @@ -430,7 +447,7 @@ </antcall> <antcall target="tests-report"/> </target> - + <!-- Run a collection of unit tests. ant -Dtest=tools test @@ -440,13 +457,12 @@ <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> </antcall> </target> - + <!-- Common test target --> <target name="tests-main" depends="init"> <mkdir dir="${tests.output.dir}/reports"/> <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-ea"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> @@ -476,7 +492,7 @@ </batchtest> </junit> </target> - + <!-- Run a single unit test. ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test @@ -486,7 +502,6 @@ <junit printsummary="yes" showoutput="yes" dir="${tests.output.dir}"> <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> - <jvmarg value="-ea"/> <sysproperty key="build.testlog" value="${tests.output.dir}/log"/> <sysproperty key="client.scenario" value="${client.scenario}"/> <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> @@ -525,11 +540,11 @@ <test todir="${tests.output.dir}/reports" name="${test}" fork="true"/> </junit> </target> - + <!-- ================================================================== --> <!-- Reporting --> <!-- ================================================================== --> - + <!-- Build the tests report --> <target name="tests-report" depends="init" description="Build the tests report"> <junitreport todir="${tests.output.dir}/reports"> @@ -542,13 +557,13 @@ <fileset dir="${tests.output.dir}" includes="reports/**"/> </zip> </target> - + <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> - + <target name="clean" description="Delete all generated test files."> <delete dir="${tests.output.dir}"/> </target> - + </project> Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jaxb/JAXBContextTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -21,12 +21,16 @@ */ package org.jboss.test.ws.common.jaxb; +// $Id: $ + import com.sun.xml.bind.api.JAXBRIContext; import com.sun.xml.bind.api.RawAccessor; import com.sun.xml.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.bind.v2.runtime.JaxBeanInfo; import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray; +// Don't use imports from a differnt test packages. +// The dependend artifact cannot be expected to be stable +// import org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -36,76 +40,55 @@ * Test JAXB usage with artifacts that have been created through a tools layer. * * @author Heiko.Braun(a)jboss.org - * @version $Id$ * @since 29.01.2007 */ -public class JAXBContextTestCase extends JBossWSTest { - - +public class JAXBContextTestCase extends JBossWSTest +{ public void testJAXBContextCreation() throws Exception { - try { - JAXBContext ctx = JAXBContext.newInstance(org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class); - assertNotNull(ctx); - } catch (JAXBException e) { - fail(e.getMessage()); - } + System.out.println("FIXME: uses imports from a differnt test packages"); + + } +/* + public void testJAXBContextCreation() throws Exception + { + JAXBContext ctx = JAXBContext.newInstance(org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class); + assertNotNull(ctx); } public void testJAXBContextCreation2() throws Exception { - try { - JAXBContext ctx = JAXBContext.newInstance( new Class[] {org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class}); - assertNotNull(ctx); - } catch (JAXBException e) { - fail(e.getMessage()); - } - + JAXBContext ctx = JAXBContext.newInstance(new Class[] { org.jboss.test.ws.interop.soapwsdl.basedoclitw.RetByteArray.class }); + assertNotNull(ctx); } - /** - * Test non-public API - */ public void testAccessor() throws Exception { - try { - - QName name = new QName("http://tempuri.org/";, "inByteArray"); - final Class aClass = RetByteArray.class; - JAXBRIContext ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { aClass }); + QName name = new QName("http://tempuri.org/";, "inByteArray"); + final Class aClass = RetByteArray.class; + JAXBRIContext ctx = (JAXBRIContext)JAXBRIContext.newInstance(new Class[] { aClass }); - JaxBeanInfo bi = ((JAXBContextImpl)ctx).getBeanInfo(aClass); + JaxBeanInfo bi = ((JAXBContextImpl)ctx).getBeanInfo(aClass); - RawAccessor accessor = ctx.getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); - assertNotNull(accessor); + RawAccessor accessor = ctx.getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); + assertNotNull(accessor); - RetByteArray byteArray = new RetByteArray(); - accessor.set(byteArray, "Hello World".getBytes()); - assertEquals(accessor.get(byteArray), "Hello World".getBytes()); - } catch (JAXBException e) { - fail(e.getMessage()); - } - + RetByteArray byteArray = new RetByteArray(); + accessor.set(byteArray, "Hello World".getBytes()); + assertEquals(accessor.get(byteArray), "Hello World".getBytes()); } - /** - * Test non-public API - */ public void testAccessor2() throws Exception { - try { - QName name = new QName("http://tempuri.org/";, "inByteArray"); - Class<RetByteArray> aClass = RetByteArray.class; - JAXBContext ctx = JAXBContext.newInstance("org.jboss.test.ws.interop.soapwsdl.basedoclitw"); - RawAccessor accessor = ((JAXBRIContext)ctx).getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); - assertNotNull(accessor); - RetByteArray byteArray = new RetByteArray(); - accessor.set(byteArray, "Hello World".getBytes()); - assertEquals(accessor.get(byteArray), "Hello World".getBytes()); - } catch (JAXBException e) { - fail(e.getMessage()); - } - + QName name = new QName("http://tempuri.org/";, "inByteArray"); + Class<RetByteArray> aClass = RetByteArray.class; + JAXBContext ctx = JAXBContext.newInstance("org.jboss.test.ws.interop.soapwsdl.basedoclitw"); + RawAccessor accessor = ((JAXBRIContext)ctx).getElementPropertyAccessor(aClass, name.getNamespaceURI(), name.getLocalPart()); + assertNotNull(accessor); + RetByteArray byteArray = new RetByteArray(); + accessor.set(byteArray, "Hello World".getBytes()); + assertEquals(accessor.get(byteArray), "Hello World".getBytes()); } +*/ } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -107,6 +107,11 @@ } } + /** + * [JBWS-800] ClassCastException when trying to marshal a SybaseTimestamp + * + * http://jira.jboss.org/jira/browse/JBWS-800 + */ public void testMarshallSimpleUserTypeWithUserDate() throws Exception { class UserDate extends Date @@ -116,6 +121,7 @@ super(date); } } + TimeZone tz = TimeZone.getDefault(); TimeZone.setDefault(TimeZone.getTimeZone("GMT")); try @@ -131,9 +137,8 @@ " <d>1968-12-16T00:00:00.000Z</d>" + "</ns1:SimpleUser>"; - System.out.println("FIXME: [JBWS-800] ClassCastException when trying to marshal a SybaseTimestamp"); - //String was = marshalSimpleType(obj); - //assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was)); + String was = marshalSimpleType(obj); + assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was)); } finally { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/common/soap/MessageFactoryTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -81,8 +81,7 @@ assertEquals("urn:uddi-org:api_v2", soapBodyElement.getNamespaceURI()); } - // http://jira.jboss.org/jira/browse/JBWS-745 - // SAAJ:SOAPBodyElement.addNamespaceDeclaration should allow empty prefix + // [JBWS-745] SAAJ:SOAPBodyElement.addNamespaceDeclaration should allow empty prefix public void testAddNamespaceDeclaration() throws Exception { MessageFactory factory = new MessageFactoryImpl(); @@ -108,8 +107,7 @@ assertEquals(expEnv, env); } - // http://jira.jboss.org/jira/browse/JBWS-1407 - // Premature end of File exception on createMessage + // [JBWS-1407] Premature end of File exception on createMessage public void testPrematureEndOfFile() throws Exception { File envFile = new File("resources/common/soap/MessageFactory/jbws1407.xml"); @@ -150,4 +148,33 @@ assertEquals(DOMUtils.parse(expMsg), DOMUtils.parse(wasMsg)); } -} + + // [JBWS-1511] MessageFactory does not preserve comments + public void testPreserveComments() throws Exception + { + String expMsg = + "<soapenv:Envelope xmlns:soapenv='http://schemas.xmlsoap.org/soap/envelope/'>" + + " <!-- header -->" + + " <soapenv:Header>" + + " <!-- header element -->" + + " <header>kermit</header>" + + " </soapenv:Header>" + + " <!-- body -->" + + " <soapenv:Body>" + + " <!-- body element -->" + + " <Hello>" + + " <!-- element -->" + + " <argument>kermit</argument>" + + " </Hello>" + + " </soapenv:Body>" + + "</soapenv:Envelope>"; + + MessageFactory factory = new MessageFactoryImpl(); + ByteArrayInputStream inputStream = new ByteArrayInputStream(expMsg.getBytes()); + SOAPMessage soapMsg = factory.createMessage(null, inputStream); + SOAPEnvelope env = soapMsg.getSOAPPart().getEnvelope(); + + System.out.println("FIXME: [JBWS-1511] MessageFactory does not preserve comments"); + //assertEquals(DOMUtils.parse(expMsg), (Element)env); + } +} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115 (from rev 2371, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-02-15 16:25:26 UTC (rev 2371) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,65 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.jbws1115; - -import javax.management.Attribute; -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * Auto discover HTTP(S) port configuration from Tomcat - * - * http://jira.jboss.org/jira/browse/JBWS-1115 - * - * @author darran.lofthouse(a)jboss.com - * @since 15-October-2006 - */ -public class JBWS1115TestCase extends JBossWSTest -{ - - private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager"); - - public void testDiscoverWebServicePort() throws Exception - { - MBeanServerConnection server = getServer(); - Attribute attribute = new Attribute("WebServicePort", new Integer(0)); - server.setAttribute(manager, attribute); - Integer port = (Integer)server.getAttribute(manager, "WebServicePort"); - - System.out.println("FIXME: [JBWS-1115] Auto discover HTTP(S) port configuration from Tomcat"); - //assertEquals("WebServicePort", 8080, port.intValue()); - } - - public void testDiscoverWebServiceSecurePort() throws Exception - { - MBeanServerConnection server = getServer(); - Attribute attribute = new Attribute("WebServiceSecurePort", new Integer(0)); - server.setAttribute(manager, attribute); - Integer port = (Integer)server.getAttribute(manager, "WebServiceSecurePort"); - - System.out.println("FIXME: [JBWS-1115] Auto discover HTTP(S) port configuration from Tomcat"); - //assertEquals("WebServiceSecurePort", 8443, port.intValue()); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java (from rev 2371, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/jbws1115/JBWS1115TestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,67 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxrpc.jbws1115; + +import javax.management.Attribute; +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.utils.ObjectNameFactory; + +/** + * Auto discover HTTP(S) port configuration from Tomcat + * + * http://jira.jboss.org/jira/browse/JBWS-1115 + * + * @author darran.lofthouse(a)jboss.com + * @author Thomas.Diesler(a)jboss.com + * @since 15-October-2006 + */ +public class JBWS1115TestCase extends JBossWSTest +{ + private final ObjectName manager = ObjectNameFactory.create("jboss.ws:service=ServiceEndpointManager"); + + public void testDiscoverWebServicePort() throws Exception + { + MBeanServerConnection server = getServer(); + + String attrName = "WebServicePort"; + Integer orgPort = (Integer)server.getAttribute(manager, attrName); + server.setAttribute(manager, new Attribute(attrName, new Integer(0))); + Integer newPort = (Integer)server.getAttribute(manager, attrName); + + assertEquals(attrName, orgPort, newPort); + } + + public void testDiscoverWebServiceSecurePort() throws Exception + { + MBeanServerConnection server = getServer(); + + String attrName = "WebServiceSecurePort"; + Integer orgPort = (Integer)server.getAttribute(manager, attrName); + server.setAttribute(manager, new Attribute(attrName, new Integer(0))); + Integer newPort = (Integer)server.getAttribute(manager, attrName); + + assertEquals(attrName, orgPort, newPort); + } +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -34,6 +34,8 @@ */ public class JMSTransportTestCase extends JBossWSTest { + private static boolean waitForResponse; + public static Test suite() throws Exception { return JBossWSTestSetup.newTestSetup(JMSTransportTestCase.class, "jaxrpc-samples-jmstransport.sar"); @@ -84,11 +86,18 @@ TextMessage message = session.createTextMessage(reqMessage); message.setJMSReplyTo(resQueue); + waitForResponse = true; + QueueSender sender = session.createSender(reqQueue); sender.send(message); sender.close(); - Thread.sleep(500); + int timeout = 5000; + while (waitForResponse && timeout > 0) + { + Thread.sleep(100); + timeout -= 100; + } assertNotNull("Expected response message", responseListener.resMessage); assertEquals(DOMUtils.parse(resMessage), DOMUtils.parse(responseListener.resMessage)); @@ -108,6 +117,7 @@ try { resMessage = textMessage.getText(); + waitForResponse = false; } catch (Throwable t) { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPHandlerTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -44,7 +44,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-doclit_handler.war, jaxrpc-samples-xop-doclit_handler-client.jar"); + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-doclit_handler.war, jaxrpc-xop-doclit_handler-client.jar"); } protected void setUp() throws Exception @@ -58,7 +58,7 @@ ((StubExt)port).setConfigName("Standard MTOM client"); } - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit_handler"); + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit_handler"); } protected XOPPing getPort() { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -43,7 +43,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-doclit.war, jaxrpc-samples-xop-doclit-client.jar"); + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-doclit.war, jaxrpc-xop-doclit-client.jar"); } protected void setUp() throws Exception @@ -57,7 +57,7 @@ ((StubExt)port).setConfigName("Standard MTOM client"); } - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-doclit"); + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-doclit"); } protected XOPPing getPort() Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPHandlerTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -40,7 +40,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-samples-xop-rpclit_handler.war, jaxrpc-samples-xop-rpclit_handler-client.jar"); + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxrpc-xop-rpclit_handler.war, jaxrpc-xop-rpclit_handler-client.jar"); } protected void setUp() throws Exception @@ -54,7 +54,7 @@ ((StubExt)port).setConfigName("Standard MTOM client"); } - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit_handler"); + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit_handler"); } protected XOPPing getPort() { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -42,7 +42,7 @@ public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-samples-xop-rpclit.war, jaxrpc-samples-xop-rpclit-client.jar"); + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxrpc-xop-rpclit.war, jaxrpc-xop-rpclit-client.jar"); } protected void setUp() throws Exception @@ -56,7 +56,7 @@ ((StubExt)port).setConfigName("Standard MTOM client"); } - //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-samples-xop-rpclit"); + //((Stub)port)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, "http://localhost:8081/jaxrpc-xop-rpclit"); } protected XOPPing getPort() { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Address.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,76 +1,146 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * Represents a normal address. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Address complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Address"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="city" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="street" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="zip" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Address -{ - private String street; - private String city; - private String state; - private String zip; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Address", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "city", + "state", + "street", + "zip" +}) +public class Address { - public String getCity() - { - return city; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String city; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String state; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String street; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String zip; - public void setCity(String city) - { - this.city = city; - } + /** + * Gets the value of the city property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getCity() { + return city; + } - public String getState() - { - return state; - } + /** + * Sets the value of the city property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setCity(String value) { + this.city = value; + } - public void setState(String state) - { - this.state = state; - } + /** + * Gets the value of the state property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getState() { + return state; + } - public String getStreet() - { - return street; - } + /** + * Sets the value of the state property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setState(String value) { + this.state = value; + } - public void setStreet(String street) - { - this.street = street; - } + /** + * Gets the value of the street property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getStreet() { + return street; + } - public String getZip() - { - return zip; - } + /** + * Sets the value of the street property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setStreet(String value) { + this.street = value; + } - public void setZip(String zip) - { - this.zip = zip; - } -} \ No newline at end of file + /** + * Gets the value of the zip property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getZip() { + return zip; + } + + /** + * Sets the value of the zip property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setZip(String value) { + this.zip = value; + } + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredException.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,50 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jsr181.complex; - -/** - * Denotes that this customer already exists - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class AlreadyRegisteredException extends RegistrationException -{ - private long existingId; - - public AlreadyRegisteredException(String message, long existingId, Throwable cause) - { - super(message, cause); - this.existingId = existingId; - } - - public AlreadyRegisteredException(String message, long existingId) - { - super(message); - this.existingId = existingId; - } - - public long getExistingId() - { - return existingId; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,54 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for AlreadyRegisteredFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="AlreadyRegisteredFault"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFa... + * &lt;sequence> + * &lt;element name="existingId" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "AlreadyRegisteredFault", propOrder = { + "existingId" +}) +public class AlreadyRegisteredFault + extends RegistrationFault +{ + + protected long existingId; + + /** + * Gets the value of the existingId property. + * + */ + public long getExistingId() { + return existingId; + } + + /** + * Sets the value of the existingId property. + * + */ + public void setExistingId(long value) { + this.existingId = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/AlreadyRegisteredFault_Exception.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.ws.WebFault; + + +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebFault(name = "AlreadyRegisteredFault", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public class AlreadyRegisteredFault_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private AlreadyRegisteredFault faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public AlreadyRegisteredFault_Exception(String message, AlreadyRegisteredFault faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public AlreadyRegisteredFault_Exception(String message, AlreadyRegisteredFault faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.AlreadyRegisteredFault + */ + public AlreadyRegisteredFault getFaultInfo() { + return faultInfo; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegister.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,98 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * <p>Java class for BulkRegister complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="BulkRegister"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "BulkRegister", propOrder = { + "customers", + "when" +}) +public class BulkRegister { + + @XmlElement(name = "Customers", nillable = true) + protected List<Customer> customers; + @XmlElement(name = "When", required = true, nillable = true) + protected XMLGregorianCalendar when; + + /** + * Gets the value of the customers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the customers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Customer } + * + * + */ + public List<Customer> getCustomers() { + if (customers == null) { + customers = new ArrayList<Customer>(); + } + return this.customers; + } + + /** + * Gets the value of the when property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getWhen() { + return when; + } + + /** + * Sets the value of the when property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setWhen(XMLGregorianCalendar value) { + this.when = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/BulkRegisterResponse.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,102 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for BulkRegisterResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="BulkRegisterResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="RegisteredIDs" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "BulkRegisterResponse", propOrder = { + "registeredIDs", + "result" +}) +public class BulkRegisterResponse { + + @XmlElement(name = "RegisteredIDs", type = Long.class) + protected List<Long> registeredIDs; + @XmlElement(type = Long.class) + protected List<Long> result; + + /** + * Gets the value of the registeredIDs property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the registeredIDs property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getRegisteredIDs().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getRegisteredIDs() { + if (registeredIDs == null) { + registeredIDs = new ArrayList<Long>(); + } + return this.registeredIDs; + } + + /** + * Gets the value of the result property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the result property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getResult().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getResult() { + if (result == null) { + result = new ArrayList<Long>(); + } + return this.result; + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Customer.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,99 +1,178 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex; +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * Represents a customer. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Customer complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Customer"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="address" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Address"/... + * &lt;element name="contactNumbers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}PhoneNumber" maxOccurs="unbounded" minOccurs="0"/> + * &lt;element name="id" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;element name="name" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Name"/> + * &lt;element name="referredCustomers" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Customer -{ - private long id; - private Address address; - private Name name; - private PhoneNumber[] contactNumbers; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Customer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "address", + "contactNumbers", + "id", + "name", + "referredCustomers" +}) +public class Customer { - // since there is no way to differentiate between a null array - // and an array with 1 element that is null - private Customer[] referredCustomers = new Customer[0]; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected Address address; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", nillable = true) + protected List<PhoneNumber> contactNumbers; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/") + protected long id; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected Name name; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", nillable = true) + protected List<Customer> referredCustomers; - public Address getAddress() - { - return address; - } + /** + * Gets the value of the address property. + * + * @return + * possible object is + * {@link Address } + * + */ + public Address getAddress() { + return address; + } + /** + * Sets the value of the address property. + * + * @param value + * allowed object is + * {@link Address } + * + */ + public void setAddress(Address value) { + this.address = value; + } - public void setAddress(Address address) - { - this.address = address; - } + /** + * Gets the value of the contactNumbers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the contactNumbers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getContactNumbers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link PhoneNumber } + * + * + */ + public List<PhoneNumber> getContactNumbers() { + if (contactNumbers == null) { + contactNumbers = new ArrayList<PhoneNumber>(); + } + return this.contactNumbers; + } + /** + * Gets the value of the id property. + * + */ + public long getId() { + return id; + } - public PhoneNumber[] getContactNumbers() - { - return contactNumbers; - } + /** + * Sets the value of the id property. + * + */ + public void setId(long value) { + this.id = value; + } + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link Name } + * + */ + public Name getName() { + return name; + } - public void setContactNumbers(PhoneNumber[] contactNumbers) - { - this.contactNumbers = contactNumbers; - } + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link Name } + * + */ + public void setName(Name value) { + this.name = value; + } + /** + * Gets the value of the referredCustomers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the referredCustomers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getReferredCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Customer } + * + * + */ + public List<Customer> getReferredCustomers() { + if (referredCustomers == null) { + referredCustomers = new ArrayList<Customer>(); + } + return this.referredCustomers; + } - public long getId() - { - return id; - } - - - public void setId(long id) - { - this.id = id; - } - - - public Name getName() - { - return name; - } - - - public void setName(Name name) - { - this.name = name; - } - - - public Customer[] getReferredCustomers() - { - return referredCustomers; - } - - - public void setReferredCustomers(Customer[] referredCustomers) - { - this.referredCustomers = referredCustomers; - } } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatistics.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for GetStatistics complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="GetStatistics"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "GetStatistics", propOrder = { + "customer" +}) +public class GetStatistics { + + @XmlElement(name = "Customer", required = true, nillable = true) + protected Customer customer; + + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ + public Customer getCustomer() { + return customer; + } + + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ + public void setCustomer(Customer value) { + this.customer = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/GetStatisticsResponse.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,91 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + + +/** + * <p>Java class for GetStatisticsResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="GetStatisticsResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Statistics" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statisti... + * &lt;element name="result" type="{http://extra.complex.jsr181.jaxws.ws.test.jboss.org/}Statisti... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "GetStatisticsResponse", propOrder = { + "statistics", + "result" +}) +public class GetStatisticsResponse { + + @XmlElement(name = "Statistics", required = true, nillable = true) + protected Statistics statistics; + @XmlElement(required = true, nillable = true) + protected Statistics result; + + /** + * Gets the value of the statistics property. + * + * @return + * possible object is + * {@link Statistics } + * + */ + public Statistics getStatistics() { + return statistics; + } + + /** + * Sets the value of the statistics property. + * + * @param value + * allowed object is + * {@link Statistics } + * + */ + public void setStatistics(Statistics value) { + this.statistics = value; + } + + /** + * Gets the value of the result property. + * + * @return + * possible object is + * {@link Statistics } + * + */ + public Statistics getResult() { + return result; + } + + /** + * Sets the value of the result property. + * + * @param value + * allowed object is + * {@link Statistics } + * + */ + public void setResult(Statistics value) { + this.result = value; + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/InvoiceCustomer.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,43 +1,56 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * An invoice customer that has an invoice cycle day. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for InvoiceCustomer complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="InvoiceCustomer"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;sequence> + * &lt;element name="cycleDay" type="{http://www.w3.org/2001/XMLSchema}int"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class InvoiceCustomer extends Customer +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "InvoiceCustomer", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "cycleDay" +}) +public class InvoiceCustomer + extends Customer { - private int cycleDay; - public int getCycleDay() - { - return cycleDay; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/") + protected int cycleDay; - public void setCycleDay(int cycleDay) - { - this.cycleDay = cycleDay; - } + /** + * Gets the value of the cycleDay property. + * + */ + public int getCycleDay() { + return cycleDay; + } + + /** + * Sets the value of the cycleDay property. + * + */ + public void setCycleDay(int value) { + this.cycleDay = value; + } + } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/JSR181ComplexTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,314 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jsr181.complex; + +// $Id$ + +import java.io.File; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.namespace.QName; +import javax.xml.ws.Holder; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + +/** + * A complex JAX-WS test + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +public class JSR181ComplexTestCase extends JBossWSTest +{ + private Registration port; + + public static Test suite() + { + return JBossWSTestSetup.newTestSetup(JSR181ComplexTestCase.class, ""); //, "jaxws-jsr181-complex.war"); + } + + protected void _setUp() throws Exception + { + super.setUp(); + URL wsdlURL = new File("resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl").toURL(); + QName serviceName = new QName("http://org.jboss.ws/jaxws/complex", "RegistrationService"); + Service service = Service.create(wsdlURL, serviceName); + port = (Registration)service.getPort(Registration.class); + } + + public void testRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + Customer customer = getFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + XMLGregorianCalendar cal = getCalendar(); + + Holder<Long> registeredID = new Holder<Long>(); + Holder<Long> result = new Holder<Long>(); + port.register(customer, cal, registeredID, result); + + customer = getAlCapone(); + try + { + port.register(customer, cal, registeredID, result); + fail("Expected AlreadyRegisteredFault"); + } + catch (AlreadyRegisteredFault_Exception e) + { + assertEquals(456, e.getFaultInfo().getExistingId()); + } + } + + public void testInvoiceRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + InvoiceCustomer customer = getInvoiceFredJackson(); + customer.getReferredCustomers().add(getJohnDoe()); + customer.getReferredCustomers().add(getAlCapone()); + + Holder<Boolean> done = new Holder<Boolean>(); + Holder<Boolean> result = new Holder<Boolean>(); + port.registerForInvoice(customer, done, result); + assertTrue(result.value); + } + + public void testOtherPackage() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + Holder<Statistics> statistics = new Holder<Statistics>(); + Holder<Statistics> result = new Holder<Statistics>(); + port.getStatistics(getFredJackson(), statistics, result); + Statistics stats = statistics.value; + + System.out.println(stats.getActivationTime()); + + assertEquals(10, stats.getHits()); + } + + public void testBulkRegistration() throws Exception + { + if (true) + { + System.out.println("FIXME: [JBWS-1525] Fix complex jsr181 test"); + return; + } + + List<Customer> customers = new ArrayList<Customer>(); + customers.add(getFredJackson()); + customers.add(getJohnDoe()); + + Holder<List<Long>> registeredIDs = new Holder<List<Long>>(); + Holder<List<Long>> result = new Holder<List<Long>>(); + port.bulkRegister(customers, getCalendar(), registeredIDs, result); + + assertEquals(123, result.value.get(0).longValue()); + assertEquals(124, result.value.get(1).longValue()); + + customers.clear(); + customers.add(getFredJackson()); + customers.add(getInvalid(754)); + customers.add(getInvalid(753)); + customers.add(getJohnDoe()); + customers.add(getInvalid(752)); + + try + { + port.bulkRegister(customers, getCalendar(), registeredIDs, result); + } + catch (ValidationFault_Exception e) + { + List<Long> failedCustomers = e.getFaultInfo().getFailedCustomers(); + assertEquals(754, failedCustomers.get(0).longValue()); + assertEquals(753, failedCustomers.get(1).longValue()); + assertEquals(752, failedCustomers.get(2).longValue()); + } + } + + private Customer getFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + Customer customer = new Customer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + return customer; + } + + private InvoiceCustomer getInvoiceFredJackson() + { + Name name = new Name(); + name.setFirstName("Fred"); + name.setMiddleName("Jones"); + name.setLastName("Jackson"); + + Address address = new Address(); + address.setCity("Atlanta"); + address.setState("Georgia"); + address.setZip("53717"); + address.setStreet("Yet Another Peach Tree St."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("123"); + number1.setExchange("456"); + number1.setLine("7890"); + + PhoneNumber number2 = new PhoneNumber(); + number1.setAreaCode("333"); + number1.setExchange("222"); + number1.setLine("1234"); + + InvoiceCustomer customer = new InvoiceCustomer(); + customer.setId(123); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.getContactNumbers().add(number2); + customer.setCycleDay(10); + return customer; + } + + private Customer getJohnDoe() + { + Name name = new Name(); + name.setFirstName("John"); + name.setLastName("Doe"); + + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(124); + return customer; + } + + private Customer getInvalid(long id) + { + Address address = new Address(); + address.setCity("New York"); + address.setState("New York"); + address.setZip("10010"); + address.setStreet("Park Street"); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("555"); + number1.setExchange("867"); + number1.setLine("5309"); + + Customer customer = new Customer(); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(id); + return customer; + } + + private Customer getAlCapone() + { + Name name = new Name(); + name.setFirstName("Al"); + name.setLastName("Capone"); + + Address address = new Address(); + address.setCity("Chicago"); + address.setState("Illinois"); + address.setZip("60619"); + address.setStreet("7244 South Prairie Avenue."); + + PhoneNumber number1 = new PhoneNumber(); + number1.setAreaCode("888"); + number1.setExchange("722"); + number1.setLine("7322"); + + Customer customer = new Customer(); + customer.setName(name); + customer.setAddress(address); + customer.getContactNumbers().add(number1); + customer.setId(125); + return customer; + } + + private XMLGregorianCalendar getCalendar() throws DatatypeConfigurationException + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } +} \ No newline at end of file Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Name.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,73 +1,118 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * A normal name. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for Name complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Name"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="firstName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="lastName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="middleName" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class Name -{ - private String firstName; - private String middleName; - private String lastName; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Name", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "firstName", + "lastName", + "middleName" +}) +public class Name { - public String getFirstName() - { - return firstName; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String firstName; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String lastName; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String middleName; - public void setFirstName(String firstName) - { - this.firstName = firstName; - } + /** + * Gets the value of the firstName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFirstName() { + return firstName; + } - public String getLastName() - { - return lastName; - } + /** + * Sets the value of the firstName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFirstName(String value) { + this.firstName = value; + } - public void setLastName(String lastName) - { - this.lastName = lastName; - } + /** + * Gets the value of the lastName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLastName() { + return lastName; + } - public String getMiddleName() - { - return middleName; - } + /** + * Sets the value of the lastName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLastName(String value) { + this.lastName = value; + } - public void setMiddleName(String middleName) - { - this.middleName = middleName; - } + /** + * Gets the value of the middleName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMiddleName() { + return middleName; + } - public String toString() - { - if (middleName == null) - return firstName + " " + lastName; + /** + * Sets the value of the middleName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMiddleName(String value) { + this.middleName = value; + } - return firstName + " " + middleName + " " + lastName; - } -} \ No newline at end of file +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ObjectFactory.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,273 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jsr181.complex package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _GetStatistics_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "GetStatistics"); + private final static QName _BulkRegisterResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "BulkRegisterResponse"); + private final static QName _RegisterForInvoiceResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterForInvoiceResponse"); + private final static QName _BulkRegister_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "BulkRegister"); + private final static QName _RegisterResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterResponse"); + private final static QName _RegistrationFault_QNAME = new QName("http://complex.jsr181.jaxws.ws.test.jboss.org/";, "RegistrationFault"); + private final static QName _AlreadyRegisteredFault_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "AlreadyRegisteredFault"); + private final static QName _GetStatisticsResponse_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "GetStatisticsResponse"); + private final static QName _Register_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "Register"); + private final static QName _ValidationFault_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "ValidationFault"); + private final static QName _RegisterForInvoice_QNAME = new QName("http://org.jboss.ws/jaxws/complex", "RegisterForInvoice"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link InvoiceCustomer } + * + */ + public InvoiceCustomer createInvoiceCustomer() { + return new InvoiceCustomer(); + } + + /** + * Create an instance of {@link PhoneNumber } + * + */ + public PhoneNumber createPhoneNumber() { + return new PhoneNumber(); + } + + /** + * Create an instance of {@link RegistrationFault } + * + */ + public RegistrationFault createRegistrationFault() { + return new RegistrationFault(); + } + + /** + * Create an instance of {@link AlreadyRegisteredFault } + * + */ + public AlreadyRegisteredFault createAlreadyRegisteredFault() { + return new AlreadyRegisteredFault(); + } + + /** + * Create an instance of {@link RegisterForInvoice } + * + */ + public RegisterForInvoice createRegisterForInvoice() { + return new RegisterForInvoice(); + } + + /** + * Create an instance of {@link ValidationFault } + * + */ + public ValidationFault createValidationFault() { + return new ValidationFault(); + } + + /** + * Create an instance of {@link GetStatistics } + * + */ + public GetStatistics createGetStatistics() { + return new GetStatistics(); + } + + /** + * Create an instance of {@link BulkRegisterResponse } + * + */ + public BulkRegisterResponse createBulkRegisterResponse() { + return new BulkRegisterResponse(); + } + + /** + * Create an instance of {@link RegisterResponse } + * + */ + public RegisterResponse createRegisterResponse() { + return new RegisterResponse(); + } + + /** + * Create an instance of {@link Customer } + * + */ + public Customer createCustomer() { + return new Customer(); + } + + /** + * Create an instance of {@link RegisterForInvoiceResponse } + * + */ + public RegisterForInvoiceResponse createRegisterForInvoiceResponse() { + return new RegisterForInvoiceResponse(); + } + + /** + * Create an instance of {@link Register } + * + */ + public Register createRegister() { + return new Register(); + } + + /** + * Create an instance of {@link GetStatisticsResponse } + * + */ + public GetStatisticsResponse createGetStatisticsResponse() { + return new GetStatisticsResponse(); + } + + /** + * Create an instance of {@link Address } + * + */ + public Address createAddress() { + return new Address(); + } + + /** + * Create an instance of {@link Name } + * + */ + public Name createName() { + return new Name(); + } + + /** + * Create an instance of {@link BulkRegister } + * + */ + public BulkRegister createBulkRegister() { + return new BulkRegister(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetStatistics }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "GetStatistics") + public JAXBElement<GetStatistics> createGetStatistics(GetStatistics value) { + return new JAXBElement<GetStatistics>(_GetStatistics_QNAME, GetStatistics.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BulkRegisterResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "BulkRegisterResponse") + public JAXBElement<BulkRegisterResponse> createBulkRegisterResponse(BulkRegisterResponse value) { + return new JAXBElement<BulkRegisterResponse>(_BulkRegisterResponse_QNAME, BulkRegisterResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterForInvoiceResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterForInvoiceResponse") + public JAXBElement<RegisterForInvoiceResponse> createRegisterForInvoiceResponse(RegisterForInvoiceResponse value) { + return new JAXBElement<RegisterForInvoiceResponse>(_RegisterForInvoiceResponse_QNAME, RegisterForInvoiceResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link BulkRegister }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "BulkRegister") + public JAXBElement<BulkRegister> createBulkRegister(BulkRegister value) { + return new JAXBElement<BulkRegister>(_BulkRegister_QNAME, BulkRegister.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterResponse") + public JAXBElement<RegisterResponse> createRegisterResponse(RegisterResponse value) { + return new JAXBElement<RegisterResponse>(_RegisterResponse_QNAME, RegisterResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegistrationFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", name = "RegistrationFault") + public JAXBElement<RegistrationFault> createRegistrationFault(RegistrationFault value) { + return new JAXBElement<RegistrationFault>(_RegistrationFault_QNAME, RegistrationFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link AlreadyRegisteredFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "AlreadyRegisteredFault") + public JAXBElement<AlreadyRegisteredFault> createAlreadyRegisteredFault(AlreadyRegisteredFault value) { + return new JAXBElement<AlreadyRegisteredFault>(_AlreadyRegisteredFault_QNAME, AlreadyRegisteredFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link GetStatisticsResponse }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "GetStatisticsResponse") + public JAXBElement<GetStatisticsResponse> createGetStatisticsResponse(GetStatisticsResponse value) { + return new JAXBElement<GetStatisticsResponse>(_GetStatisticsResponse_QNAME, GetStatisticsResponse.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Register }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "Register") + public JAXBElement<Register> createRegister(Register value) { + return new JAXBElement<Register>(_Register_QNAME, Register.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link ValidationFault }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "ValidationFault") + public JAXBElement<ValidationFault> createValidationFault(ValidationFault value) { + return new JAXBElement<ValidationFault>(_ValidationFault_QNAME, ValidationFault.class, null, value); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link RegisterForInvoice }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://org.jboss.ws/jaxws/complex", name = "RegisterForInvoice") + public JAXBElement<RegisterForInvoice> createRegisterForInvoice(RegisterForInvoice value) { + return new JAXBElement<RegisterForInvoice>(_RegisterForInvoice_QNAME, RegisterForInvoice.class, null, value); + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/PhoneNumber.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,65 +1,118 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + /** - * A typical phone number object. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * <p>Java class for PhoneNumber complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="PhoneNumber"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="areaCode" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="exchange" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;element name="line" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * */ -public class PhoneNumber -{ - private String exchange; - private String areaCode; - private String line; +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "PhoneNumber", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "areaCode", + "exchange", + "line" +}) +public class PhoneNumber { - public String getAreaCode() - { - return areaCode; - } + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String areaCode; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String exchange; + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String line; - public void setAreaCode(String areaCode) - { - this.areaCode = areaCode; - } + /** + * Gets the value of the areaCode property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAreaCode() { + return areaCode; + } - public String getExchange() - { - return exchange; - } + /** + * Sets the value of the areaCode property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAreaCode(String value) { + this.areaCode = value; + } - public void setExchange(String exchange) - { - this.exchange = exchange; - } + /** + * Gets the value of the exchange property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getExchange() { + return exchange; + } - public String getLine() - { - return line; - } + /** + * Sets the value of the exchange property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setExchange(String value) { + this.exchange = value; + } - public void setLine(String line) - { - this.line = line; - } + /** + * Gets the value of the line property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getLine() { + return line; + } + + /** + * Sets the value of the line property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setLine(String value) { + this.line = value; + } + } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Register.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,91 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * <p>Java class for Register complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Register"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Customer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}Customer"... + * &lt;element name="When" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Register", propOrder = { + "customer", + "when" +}) +public class Register { + + @XmlElement(name = "Customer", required = true, nillable = true) + protected Customer customer; + @XmlElement(name = "When", required = true, nillable = true) + protected XMLGregorianCalendar when; + + /** + * Gets the value of the customer property. + * + * @return + * possible object is + * {@link Customer } + * + */ + public Customer getCustomer() { + return customer; + } + + /** + * Sets the value of the customer property. + * + * @param value + * allowed object is + * {@link Customer } + * + */ + public void setCustomer(Customer value) { + this.customer = value; + } + + /** + * Gets the value of the when property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getWhen() { + return when; + } + + /** + * Sets the value of the when property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setWhen(XMLGregorianCalendar value) { + this.when = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoice.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterForInvoice complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterForInvoice"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="InvoiceCustomer" type="{http://complex.jsr181.jaxws.ws.test.jboss.org/}InvoiceCustome... + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterForInvoice", propOrder = { + "invoiceCustomer" +}) +public class RegisterForInvoice { + + @XmlElement(name = "InvoiceCustomer", required = true, nillable = true) + protected InvoiceCustomer invoiceCustomer; + + /** + * Gets the value of the invoiceCustomer property. + * + * @return + * possible object is + * {@link InvoiceCustomer } + * + */ + public InvoiceCustomer getInvoiceCustomer() { + return invoiceCustomer; + } + + /** + * Sets the value of the invoiceCustomer property. + * + * @param value + * allowed object is + * {@link InvoiceCustomer } + * + */ + public void setInvoiceCustomer(InvoiceCustomer value) { + this.invoiceCustomer = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterForInvoiceResponse.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterForInvoiceResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterForInvoiceResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="done" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}boolean"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterForInvoiceResponse", propOrder = { + "done", + "result" +}) +public class RegisterForInvoiceResponse { + + protected boolean done; + protected boolean result; + + /** + * Gets the value of the done property. + * + */ + public boolean isDone() { + return done; + } + + /** + * Sets the value of the done property. + * + */ + public void setDone(boolean value) { + this.done = value; + } + + /** + * Gets the value of the result property. + * + */ + public boolean isResult() { + return result; + } + + /** + * Sets the value of the result property. + * + */ + public void setResult(boolean value) { + this.result = value; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegisterResponse.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,73 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegisterResponse complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegisterResponse"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="RegisteredID" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;element name="result" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegisterResponse", propOrder = { + "registeredID", + "result" +}) +public class RegisterResponse { + + @XmlElement(name = "RegisteredID") + protected long registeredID; + protected long result; + + /** + * Gets the value of the registeredID property. + * + */ + public long getRegisteredID() { + return registeredID; + } + + /** + * Sets the value of the registeredID property. + * + */ + public void setRegisteredID(long value) { + this.registeredID = value; + } + + /** + * Gets the value of the result property. + * + */ + public long getResult() { + return result; + } + + /** + * Sets the value of the result property. + * + */ + public void setResult(long value) { + this.result = value; + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/Registration.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,62 +1,117 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + package org.jboss.test.ws.jaxws.jsr181.complex; -import java.util.Date; - +import java.util.List; import javax.jws.WebMethod; import javax.jws.WebParam; -import javax.jws.WebResult; import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.ws.Holder; +import javax.xml.ws.RequestWrapper; +import javax.xml.ws.ResponseWrapper; import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; -@WebService -@SOAPBinding(style = SOAPBinding.Style.DOCUMENT, use = SOAPBinding.Use.LITERAL, parameterStyle = SOAPBinding.ParameterStyle.WRAPPED) -public interface Registration -{ - @WebMethod(operationName = "Register") - @WebResult(name = "RegisteredID") - public abstract long register( - @WebParam(name = "Customer") Customer customer, - @WebParam(name = "When") Date when) - throws ValidationException, AlreadyRegisteredException; - @WebMethod(operationName = "BulkRegister") - @WebResult(name = "RegisteredIDs") - public abstract long[] bulkRegister( - @WebParam(name = "Customers") Customer[] customers, - @WebParam(name = "When")Date when) - throws ValidationException, AlreadyRegisteredException; +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebService(name = "Registration", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public interface Registration { - @WebMethod(operationName = "RegisterForInvoice") - @WebResult(name = "done") - public abstract boolean registerForInvoice( - @WebParam(name = "InvoiceCustomer") InvoiceCustomer customer) - throws ValidationException, AlreadyRegisteredException; - @WebMethod(operationName = "GetStatistics") - @WebResult(name = "Statistics") - public abstract Statistics getStatistics( - @WebParam(name = "Customer") Customer customer); -} \ No newline at end of file + /** + * + * @param when + * @param customers + * @param result + * @param registeredIDs + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "BulkRegister") + @RequestWrapper(localName = "BulkRegister", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegister") + @ResponseWrapper(localName = "BulkRegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.BulkRegisterResponse") + public void bulkRegister( + @WebParam(name = "Customers", targetNamespace = "http://org.jboss.ws/jaxws/complex") + List<Customer> customers, + @WebParam(name = "When", targetNamespace = "http://org.jboss.ws/jaxws/complex") + XMLGregorianCalendar when, + @WebParam(name = "RegisteredIDs", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<List<Long>> registeredIDs, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<List<Long>> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + + /** + * + * @param result + * @param statistics + * @param customer + */ + @WebMethod(operationName = "GetStatistics") + @RequestWrapper(localName = "GetStatistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatistics") + @ResponseWrapper(localName = "GetStatisticsResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.GetStatisticsResponse") + public void getStatistics( + @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + Customer customer, + @WebParam(name = "Statistics", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Statistics> statistics, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Statistics> result); + + /** + * + * @param registeredID + * @param when + * @param result + * @param customer + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "Register") + @RequestWrapper(localName = "Register", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.Register") + @ResponseWrapper(localName = "RegisterResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterResponse") + public void register( + @WebParam(name = "Customer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + Customer customer, + @WebParam(name = "When", targetNamespace = "http://org.jboss.ws/jaxws/complex") + XMLGregorianCalendar when, + @WebParam(name = "RegisteredID", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Long> registeredID, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Long> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + + /** + * + * @param result + * @param done + * @param invoiceCustomer + * @throws AlreadyRegisteredFault_Exception + * @throws ValidationFault_Exception + */ + @WebMethod(operationName = "RegisterForInvoice") + @RequestWrapper(localName = "RegisterForInvoice", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoice") + @ResponseWrapper(localName = "RegisterForInvoiceResponse", targetNamespace = "http://org.jboss.ws/jaxws/complex", className = "org.jboss.test.ws.jaxws.jsr181.complex.RegisterForInvoiceResponse") + public void registerForInvoice( + @WebParam(name = "InvoiceCustomer", targetNamespace = "http://org.jboss.ws/jaxws/complex") + InvoiceCustomer invoiceCustomer, + @WebParam(name = "done", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Boolean> done, + @WebParam(name = "result", targetNamespace = "http://org.jboss.ws/jaxws/complex", mode = WebParam.Mode.OUT) + Holder<Boolean> result) + throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + ; + +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationException.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,46 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jsr181.complex; - -/** - * Represents a general registration failure - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class RegistrationException extends Exception -{ - public RegistrationException(String message, Throwable cause) - { - super(message, cause); - } - - public RegistrationException(String message) - { - super(message); - } - - public RegistrationException(Throwable cause) - { - super(cause); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationFault.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,62 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for RegistrationFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="RegistrationFault"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="message" type="{http://www.w3.org/2001/XMLSchema}string"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "RegistrationFault", namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", propOrder = { + "message" +}) +public class RegistrationFault { + + @XmlElement(namespace = "http://complex.jsr181.jaxws.ws.test.jboss.org/", required = true, nillable = true) + protected String message; + + /** + * Gets the value of the message property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getMessage() { + return message; + } + + /** + * Sets the value of the message property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setMessage(String value) { + this.message = value; + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationService.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,114 +1,59 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ + package org.jboss.test.ws.jaxws.jsr181.complex; -import java.util.Calendar; -import java.util.Date; +import java.net.MalformedURLException; +import java.net.URL; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; +import javax.xml.ws.WebEndpoint; +import javax.xml.ws.WebServiceClient; -import javax.jws.WebService; -import org.jboss.logging.Logger; -import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; - /** - * A mock registration service that exercises the use of complex types, arrays, inheritence, - * and exceptions. Note that this test does not yet test polymorphic behavior. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:40 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * */ -@WebService (endpointInterface = "org.jboss.test.ws.jaxws.jsr181.complex.Registration", serviceName="RegistrationService") -public class RegistrationService implements Registration +@WebServiceClient(name = "RegistrationService", targetNamespace = "http://org.jboss.ws/jaxws/complex", wsdlLocation = "file:/home/tdiesler/svn/jbossws/branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl") +public class RegistrationService + extends Service { - // Provide logging - private static Logger log = Logger.getLogger(RegistrationService.class); - public long register(Customer customer, Date when) throws ValidationException, AlreadyRegisteredException - { - Name name = customer.getName(); - if (name == null) - { - long[] ids = new long[1]; - ids[0] = customer.getId(); - throw new ValidationException("No name!", ids); - } + private final static URL REGISTRATIONSERVICE_WSDL_LOCATION; - if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) - throw new AlreadyRegisteredException("Al Capone is already registered", 456); + static { + URL url = null; + try { + url = new URL("file:/home/tdiesler/svn/jbossws/branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl"); + } catch (MalformedURLException e) { + e.printStackTrace(); + } + REGISTRATIONSERVICE_WSDL_LOCATION = url; + } - for (Customer c : customer.getReferredCustomers()) - { - log.info("Refered customer: " + c.getName()); - } + public RegistrationService(URL wsdlLocation, QName serviceName) { + super(wsdlLocation, serviceName); + } - log.info("registering customer: " + customer); - return customer.getId(); - } + public RegistrationService() { + super(REGISTRATIONSERVICE_WSDL_LOCATION, new QName("http://org.jboss.ws/jaxws/complex", "RegistrationService")); + } - public long[] bulkRegister(Customer[] customers, Date when) throws ValidationException, AlreadyRegisteredException - { - long[] registered = new long[customers.length]; - long[] failed = new long[customers.length]; + /** + * + * @return + * returns Registration + */ + @WebEndpoint(name = "RegistrationPort") + public Registration getRegistrationPort() { + return (Registration)super.getPort(new QName("http://org.jboss.ws/jaxws/complex", "RegistrationPort"), Registration.class); + } - int x = 0; - int y = 0; - - for (Customer c : customers) - { - try - { - registered[x++] = register(c, when); - } - catch (ValidationException e) - { - failed[y++] = e.getFailiedCustomers()[0]; - } - } - - if (y > 0) - { - long[] newFailed = new long[y]; - System.arraycopy(failed, 0, newFailed, 0, y); - throw new ValidationException("Validation errors on bulk registering customers", newFailed); - } - - return registered; - } - - public boolean registerForInvoice(InvoiceCustomer customer) throws ValidationException, AlreadyRegisteredException - { - log.info("registerForInvoice: " + customer.getCycleDay()); - return true; - } - - public Statistics getStatistics(Customer customer) - { - Statistics stats = new Statistics(); - stats.hits = 10; - Calendar cal = Calendar.getInstance(); - cal.clear(); - cal.set(2006, 0, 26, 22, 59, 0); - stats.activationTime = cal; - - return stats; - } -} \ No newline at end of file +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/RegistrationServiceImpl.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,134 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.jsr181.complex; + +// $Id$ + +import java.util.ArrayList; +import java.util.List; + +import javax.jws.WebService; +import javax.xml.datatype.DatatypeConfigurationException; +import javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.XMLGregorianCalendar; +import javax.xml.ws.Holder; + +import org.jboss.logging.Logger; +import org.jboss.test.ws.jaxws.jsr181.complex.extra.Statistics; + +/** + * A mock registration service that exercises the use of complex types, arrays, inheritence, + * and exceptions. Note that this test does not yet test polymorphic behavior. + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @author Thomas.Diesler(a)jboss.com + */ +@WebService(endpointInterface = "org.jboss.test.ws.jaxws.jsr181.complex.Registration", name = "Registration") +public class RegistrationServiceImpl implements Registration +{ + // Provide logging + private static Logger log = Logger.getLogger(RegistrationServiceImpl.class); + + public void register(Customer customer, XMLGregorianCalendar when, Holder<Long> registeredID, Holder<Long> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + Name name = customer.getName(); + if (name == null) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().add(customer.getId()); + throw new ValidationFault_Exception("No name!", fault); + } + + if ("al".equalsIgnoreCase(name.getFirstName()) && "capone".equalsIgnoreCase(name.getLastName())) + { + AlreadyRegisteredFault fault = new AlreadyRegisteredFault(); + fault.setExistingId(456); + throw new AlreadyRegisteredFault_Exception("Al Capone is already registered", fault); + } + + for (Customer c : customer.getReferredCustomers()) + { + log.info("Refered customer: " + c.getName()); + } + + log.info("registering customer: " + customer); + result.value = customer.getId(); + } + + public void bulkRegister(List<Customer> customers, XMLGregorianCalendar when, Holder<List<Long>> registeredIDs, Holder<List<Long>> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + List<Long> registered = new ArrayList<Long>(customers.size()); + List<Long> failed = new ArrayList<Long>(customers.size()); + + for (Customer c : customers) + { + try + { + Holder<Long> id = new Holder<Long>(); + Holder<Long> res = new Holder<Long>(); + register(c, when, id, res); + registered.add(res.value); + } + catch (ValidationFault_Exception e) + { + failed.add(e.getFaultInfo().getFailedCustomers().get(0)); + } + } + + if (failed.size() > 0) + { + ValidationFault fault = new ValidationFault(); + fault.getFailedCustomers().addAll(failed); + throw new ValidationFault_Exception("Validation errors on bulk registering customers", fault); + } + + result.value = registered; + } + + public void registerForInvoice(InvoiceCustomer invoiceCustomer, Holder<Boolean> done, Holder<Boolean> result) throws AlreadyRegisteredFault_Exception, ValidationFault_Exception + { + log.info("registerForInvoice: " + invoiceCustomer.getCycleDay()); + result.value = true; + } + + public void getStatistics(Customer customer, Holder<Statistics> statistics, Holder<Statistics> result) + { + Statistics stats = new Statistics(); + stats.setHits(10); + stats.setActivationTime(getCalendar()); + result.value = stats; + } + + private XMLGregorianCalendar getCalendar() + { + try + { + DatatypeFactory calFactory = DatatypeFactory.newInstance(); + XMLGregorianCalendar cal = calFactory.newXMLGregorianCalendar(2002, 4, 5, 0, 0, 0, 0, 0); + return cal; + } + catch (DatatypeConfigurationException e) + { + throw new RuntimeException(e); + } + } +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationException.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,50 +0,0 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ -package org.jboss.test.ws.jaxws.jsr181.complex; - -/** - * Represents a validation error. Part of the JSR-181 Complex Test Case. - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class ValidationException extends RegistrationException -{ - private long[] failiedCustomers; - - public ValidationException(String message, long[] failureCodes, Throwable cause) - { - super(message, cause); - this.failiedCustomers = failureCodes; - } - - public ValidationException(String message, long[] failureCodes) - { - super(message); - this.failiedCustomers = failureCodes; - } - - public long[] getFailiedCustomers() - { - return failiedCustomers; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,71 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for ValidationFault complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="ValidationFault"> + * &lt;complexContent> + * &lt;extension base="{http://complex.jsr181.jaxws.ws.test.jboss.org/}RegistrationFa... + * &lt;sequence> + * &lt;element name="failedCustomers" type="{http://www.w3.org/2001/XMLSchema}long" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ValidationFault", propOrder = { + "failedCustomers" +}) +public class ValidationFault + extends RegistrationFault +{ + + @XmlElement(type = Long.class) + protected List<Long> failedCustomers; + + /** + * Gets the value of the failedCustomers property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the failedCustomers property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getFailedCustomers().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link Long } + * + * + */ + public List<Long> getFailedCustomers() { + if (failedCustomers == null) { + failedCustomers = new ArrayList<Long>(); + } + return this.failedCustomers; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/ValidationFault_Exception.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,60 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex; + +import javax.xml.ws.WebFault; + + +/** + * JBossWS Generated Source + * + * Generation Date: Fri Feb 16 11:33:41 CET 2007 + * + * This generated source code represents a derivative work of the input to + * the generator that produced it. Consult the input for the copyright and + * terms of use that apply to this source code. + * + * JAX-WS Version: 2.0 + * + */ +@WebFault(name = "ValidationFault", targetNamespace = "http://org.jboss.ws/jaxws/complex") +public class ValidationFault_Exception + extends Exception +{ + + /** + * Java type that goes as soapenv:Fault detail element. + * + */ + private ValidationFault faultInfo; + + /** + * + * @param faultInfo + * @param message + */ + public ValidationFault_Exception(String message, ValidationFault faultInfo) { + super(message); + this.faultInfo = faultInfo; + } + + /** + * + * @param faultInfo + * @param message + * @param cause + */ + public ValidationFault_Exception(String message, ValidationFault faultInfo, Throwable cause) { + super(message, cause); + this.faultInfo = faultInfo; + } + + /** + * + * @return + * returns fault bean: org.jboss.test.ws.jaxws.jsr181.complex.ValidationFault + */ + public ValidationFault getFaultInfo() { + return faultInfo; + } + +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/ObjectFactory.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,40 @@ + +package org.jboss.test.ws.jaxws.jsr181.complex.extra; + +import javax.xml.bind.annotation.XmlRegistry; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.jboss.test.ws.jaxws.jsr181.complex.extra package. + * <p>An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.test.ws.jaxws.jsr181.complex.extra + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Statistics } + * + */ + public Statistics createStatistics() { + return new Statistics(); + } + +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/Statistics.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,31 +1,82 @@ -/* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + package org.jboss.test.ws.jaxws.jsr181.complex.extra; -import java.util.Calendar; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; +import javax.xml.datatype.XMLGregorianCalendar; -public class Statistics -{ - public long hits; - public Calendar activationTime; +/** + * <p>Java class for Statistics complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="Statistics"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="activationTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/> + * &lt;element name="hits" type="{http://www.w3.org/2001/XMLSchema}long"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Statistics", propOrder = { + "activationTime", + "hits" +}) +public class Statistics { + + @XmlElement(required = true, nillable = true) + protected XMLGregorianCalendar activationTime; + protected long hits; + + /** + * Gets the value of the activationTime property. + * + * @return + * possible object is + * {@link XMLGregorianCalendar } + * + */ + public XMLGregorianCalendar getActivationTime() { + return activationTime; + } + + /** + * Sets the value of the activationTime property. + * + * @param value + * allowed object is + * {@link XMLGregorianCalendar } + * + */ + public void setActivationTime(XMLGregorianCalendar value) { + this.activationTime = value; + } + + /** + * Gets the value of the hits property. + * + */ + public long getHits() { + return hits; + } + + /** + * Sets the value of the hits property. + * + */ + public void setHits(long value) { + this.hits = value; + } + } Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/extra/package-info.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://extra.complex.jsr181.jaxws.ws.test.jboss.org/", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jsr181.complex.extra; Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/jsr181/complex/package-info.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,2 @@ +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://org.jboss.ws/jaxws/complex", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.jboss.test.ws.jaxws.jsr181.complex; Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr) Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,383 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.jaxr.scout; - -import java.net.PasswordAuthentication; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Locale; -import java.util.Properties; -import java.util.Set; - -import javax.management.MBeanServerConnection; -import javax.management.ObjectName; -import javax.xml.registry.BulkResponse; -import javax.xml.registry.BusinessLifeCycleManager; -import javax.xml.registry.BusinessQueryManager; -import javax.xml.registry.Connection; -import javax.xml.registry.ConnectionFactory; -import javax.xml.registry.FindQualifier; -import javax.xml.registry.JAXRException; -import javax.xml.registry.RegistryService; -import javax.xml.registry.infomodel.Classification; -import javax.xml.registry.infomodel.ClassificationScheme; -import javax.xml.registry.infomodel.EmailAddress; -import javax.xml.registry.infomodel.ExternalIdentifier; -import javax.xml.registry.infomodel.InternationalString; -import javax.xml.registry.infomodel.Key; -import javax.xml.registry.infomodel.LocalizedString; -import javax.xml.registry.infomodel.Organization; -import javax.xml.registry.infomodel.PersonName; -import javax.xml.registry.infomodel.PostalAddress; -import javax.xml.registry.infomodel.RegistryObject; -import javax.xml.registry.infomodel.Service; -import javax.xml.registry.infomodel.ServiceBinding; -import javax.xml.registry.infomodel.TelephoneNumber; -import javax.xml.registry.infomodel.User; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.ws.core.utils.ObjectNameFactory; - -/** - * Acts as the base class for Jaxr Test Cases - * - * @author Anil.Saldhana(a)jboss.org - * @author Thomas.Diesler(a)jboss.com - * @since 29-Dec-2004 - */ -public class JaxrBaseTest extends JBossWSTest -{ - protected String userid = "jboss"; - protected String passwd = "jboss"; - protected BusinessLifeCycleManager blm = null; - protected RegistryService rs = null; - protected BusinessQueryManager bqm = null; - protected Connection connection = null; - protected BulkResponse br = null; - protected MBeanServerConnection server = null; - - protected ConnectionFactory factory = null; - - protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi"); - - /** - * Setup of the JUnit test - * We create the juddi tables on startup - * - * @throws Exception - */ - protected void setUp() throws Exception - { - //Change the createonstart setting for juddi service and restart it - server = getServer(); - server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() }); - server.invoke(OBJECT_NAME, "stop", null, null); - server.invoke(OBJECT_NAME, "start", null, null); - - //Ensure that the Jaxr Connection Factory class is setup - String factoryString = "javax.xml.registry.ConnectionFactoryClass"; - String factoryClass = System.getProperty(factoryString); - if (factoryClass == null || factoryClass.length() == 0) - System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl"); - - String queryurl = System.getProperty("jaxr.query.url", "http://localhost:8080/juddi/inquiry"); - String puburl = System.getProperty("jaxr.publish.url", "http://localhost:8080/juddi/publish"); - - Properties props = new Properties(); - props.setProperty("javax.xml.registry.queryManagerURL", queryurl); - props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl); - - String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport"); - System.setProperty("juddi.proxy.transportClass", transportClass); - - // Create the connection, passing it the configuration properties - factory = ConnectionFactory.newInstance(); - factory.setProperties(props); - connection = factory.createConnection(); - } - - /** - * Teardown of the junit test - * We discard all the tables created by the juddi service - * - * @throws Exception - */ - protected void tearDown() throws Exception - { - if (connection != null) - connection.close(); - - //stop the juddi service so that all the tables are dropped - server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() }); - server.invoke(OBJECT_NAME, "stop", null, null); - } - - /** - * Does authentication with the uddi registry - */ - protected void login() throws JAXRException - { - PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); - Set creds = new HashSet(); - creds.add(passwdAuth); - - connection.setCredentials(creds); - } - - protected void getJAXREssentials() throws JAXRException - { - rs = connection.getRegistryService(); - blm = rs.getBusinessLifeCycleManager(); - bqm = rs.getBusinessQueryManager(); - } - - public InternationalString getIString(String str) throws JAXRException - { - return blm.createInternationalString(str); - } - - /** - * Locale aware Search a business in the registry - */ - public void searchBusiness(String bizname) throws JAXRException - { - try - { - // Get registry service and business query manager - this.getJAXREssentials(); - - // Define find qualifiers and name patterns - Collection findQualifiers = new ArrayList(); - findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC); - Collection namePatterns = new ArrayList(); - String pattern = "%" + bizname + "%"; - LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern); - namePatterns.add(ls); - - // Find based upon qualifier type and values - BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null); - - // check how many organisation we have matched - Collection orgs = response.getCollection(); - if (orgs == null) - { - log.debug(" -- Matched 0 orgs"); - - } - else - { - log.debug(" -- Matched " + orgs.size() + " organizations -- "); - - // then step through them - for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();) - { - Organization org = (Organization)orgIter.next(); - log.debug("Org name: " + getName(org)); - log.debug("Org description: " + getDescription(org)); - log.debug("Org key id: " + getKey(org)); - checkUser(org); - checkServices(org); - } - } - } - finally - { - connection.close(); - } - - } - - protected RegistryService getRegistryService() throws JAXRException - { - assertNotNull(connection); - return connection.getRegistryService(); - } - - protected BusinessQueryManager getBusinessQueryManager() throws JAXRException - { - assertNotNull(connection); - if (rs == null) - rs = this.getRegistryService(); - return rs.getBusinessQueryManager(); - } - - protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException - { - assertNotNull(connection); - if (rs == null) - rs = this.getRegistryService(); - return rs.getBusinessLifeCycleManager(); - } - - private void checkServices(Organization org) throws JAXRException - { - // Display service and binding information - Collection services = org.getServices(); - for (Iterator svcIter = services.iterator(); svcIter.hasNext();) - { - Service svc = (Service)svcIter.next(); - log.debug(" Service name: " + getName(svc)); - log.debug(" Service description: " + getDescription(svc)); - - assertEquals("JBOSS JAXR Service", getName(svc)); - assertEquals("Services of XML Registry", getDescription(svc)); - - Collection serviceBindings = svc.getServiceBindings(); - for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();) - { - ServiceBinding sb = (ServiceBinding)sbIter.next(); - log.debug(" Binding Description: " + getDescription(sb)); - log.debug(" Access URI: " + sb.getAccessURI()); - assertEquals("http://testjboss.org", sb.getAccessURI()); - assertEquals("Test Service Binding", getDescription(sb)); - } - } - } - - private void checkUser(Organization org) throws JAXRException - { - // Display primary contact information - User pc = org.getPrimaryContact(); - if (pc != null) - { - PersonName pcName = pc.getPersonName(); - log.debug(" Contact name: " + pcName.getFullName()); - assertEquals("Anil S", pcName.getFullName()); - Collection phNums = pc.getTelephoneNumbers(pc.getType()); - for (Iterator phIter = phNums.iterator(); phIter.hasNext();) - { - TelephoneNumber num = (TelephoneNumber)phIter.next(); - log.debug(" Phone number: " + num.getNumber()); - } - Collection eAddrs = pc.getEmailAddresses(); - for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();) - { - log.debug(" Email Address: " + (EmailAddress)eaIter.next()); - } - } - } - - private static String getName(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getName() != null) - { - return ro.getName().getValue(); - } - return ""; - } - - private static String getDescription(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getDescription() != null) - { - return ro.getDescription().getValue(); - } - return ""; - } - - private static String getKey(RegistryObject ro) throws JAXRException - { - if (ro != null && ro.getKey() != null) - { - return ro.getKey().getId(); - } - return ""; - } - - /** - * Creates a Jaxr Organization with 1 or more services - */ - protected Organization createOrganization(String orgname) throws JAXRException - { - Organization org = blm.createOrganization(getIString(orgname)); - org.setDescription(getIString("JBoss Inc")); - Service service = blm.createService(getIString("JBOSS JAXR Service")); - service.setDescription(getIString("Services of XML Registry")); - //Create serviceBinding - ServiceBinding serviceBinding = blm.createServiceBinding(); - serviceBinding.setDescription(blm.createInternationalString("Test Service Binding")); - - //Turn validation of URI off - serviceBinding.setValidateURI(false); - serviceBinding.setAccessURI("http://testjboss.org"); - - // Add the serviceBinding to the service - service.addServiceBinding(serviceBinding); - - User user = blm.createUser(); - org.setPrimaryContact(user); - PersonName personName = blm.createPersonName("Anil S"); - TelephoneNumber telephoneNumber = blm.createTelephoneNumber(); - telephoneNumber.setNumber("111-111-7777"); - telephoneNumber.setType(null); - PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", ""); - Collection postalAddresses = new ArrayList(); - postalAddresses.add(address); - Collection emailAddresses = new ArrayList(); - EmailAddress emailAddress = blm.createEmailAddress(&quot;anil(a)apache.org&quot;); - emailAddresses.add(emailAddress); - - Collection numbers = new ArrayList(); - numbers.add(telephoneNumber); - user.setPersonName(personName); - user.setPostalAddresses(postalAddresses); - user.setEmailAddresses(emailAddresses); - user.setTelephoneNumbers(numbers); - - ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", ""); - Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2"); - cScheme.setKey(cKey); - Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415"); - org.addClassification(classification); - ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", ""); - Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423"); - cScheme1.setKey(cKey1); - ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849"); - org.addExternalIdentifier(ei); - org.addService(service); - return org; - } - - /** - * Delete an Organization with a given key - */ - protected void deleteOrganization(Key orgkey) throws Exception - { - assertNotNull("Org Key is null?", orgkey); - if (blm == null) - blm = this.getBusinessLifeCycleManager(); - Collection keys = new ArrayList(); - keys.add(orgkey); - - BulkResponse response = blm.deleteOrganizations(keys); - Collection exceptions = response.getExceptions(); - assertNull("Deleting Org with Key=" + orgkey, exceptions); - } - - private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException - { - ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2)); - return cs; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/JaxrBaseTest.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,383 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.jaxr.scout; + +import java.net.PasswordAuthentication; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Locale; +import java.util.Properties; +import java.util.Set; + +import javax.management.MBeanServerConnection; +import javax.management.ObjectName; +import javax.xml.registry.BulkResponse; +import javax.xml.registry.BusinessLifeCycleManager; +import javax.xml.registry.BusinessQueryManager; +import javax.xml.registry.Connection; +import javax.xml.registry.ConnectionFactory; +import javax.xml.registry.FindQualifier; +import javax.xml.registry.JAXRException; +import javax.xml.registry.RegistryService; +import javax.xml.registry.infomodel.Classification; +import javax.xml.registry.infomodel.ClassificationScheme; +import javax.xml.registry.infomodel.EmailAddress; +import javax.xml.registry.infomodel.ExternalIdentifier; +import javax.xml.registry.infomodel.InternationalString; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.LocalizedString; +import javax.xml.registry.infomodel.Organization; +import javax.xml.registry.infomodel.PersonName; +import javax.xml.registry.infomodel.PostalAddress; +import javax.xml.registry.infomodel.RegistryObject; +import javax.xml.registry.infomodel.Service; +import javax.xml.registry.infomodel.ServiceBinding; +import javax.xml.registry.infomodel.TelephoneNumber; +import javax.xml.registry.infomodel.User; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.ws.core.utils.ObjectNameFactory; + +/** + * Acts as the base class for Jaxr Test Cases + * + * @author Anil.Saldhana(a)jboss.org + * @author Thomas.Diesler(a)jboss.com + * @since 29-Dec-2004 + */ +public class JaxrBaseTest extends JBossWSTest +{ + protected String userid = "jboss"; + protected String passwd = "jboss"; + protected BusinessLifeCycleManager blm = null; + protected RegistryService rs = null; + protected BusinessQueryManager bqm = null; + protected Connection connection = null; + protected BulkResponse br = null; + protected MBeanServerConnection server = null; + + protected ConnectionFactory factory = null; + + protected static final ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss:service=juddi"); + + /** + * Setup of the JUnit test + * We create the juddi tables on startup + * + * @throws Exception + */ + protected void setUp() throws Exception + { + //Change the createonstart setting for juddi service and restart it + server = getServer(); + server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.TRUE }, new String[] { Boolean.TYPE.getName() }); + server.invoke(OBJECT_NAME, "stop", null, null); + server.invoke(OBJECT_NAME, "start", null, null); + + //Ensure that the Jaxr Connection Factory class is setup + String factoryString = "javax.xml.registry.ConnectionFactoryClass"; + String factoryClass = System.getProperty(factoryString); + if (factoryClass == null || factoryClass.length() == 0) + System.setProperty(factoryString, "org.apache.ws.scout.registry.ConnectionFactoryImpl"); + + String queryurl = System.getProperty("jaxr.query.url", "http://localhost:8080/juddi/inquiry"); + String puburl = System.getProperty("jaxr.publish.url", "http://localhost:8080/juddi/publish"); + + Properties props = new Properties(); + props.setProperty("javax.xml.registry.queryManagerURL", queryurl); + props.setProperty("javax.xml.registry.lifeCycleManagerURL", puburl); + + String transportClass = System.getProperty("juddi.proxy.transportClass", "org.jboss.jaxr.juddi.transport.SaajTransport"); + System.setProperty("juddi.proxy.transportClass", transportClass); + + // Create the connection, passing it the configuration properties + factory = ConnectionFactory.newInstance(); + factory.setProperties(props); + connection = factory.createConnection(); + } + + /** + * Teardown of the junit test + * We discard all the tables created by the juddi service + * + * @throws Exception + */ + protected void tearDown() throws Exception + { + if (connection != null) + connection.close(); + + //stop the juddi service so that all the tables are dropped + server.invoke(OBJECT_NAME, "setCreateOnStart", new Object[] { Boolean.FALSE }, new String[] { Boolean.TYPE.getName() }); + server.invoke(OBJECT_NAME, "stop", null, null); + } + + /** + * Does authentication with the uddi registry + */ + protected void login() throws JAXRException + { + PasswordAuthentication passwdAuth = new PasswordAuthentication(userid, passwd.toCharArray()); + Set creds = new HashSet(); + creds.add(passwdAuth); + + connection.setCredentials(creds); + } + + protected void getJAXREssentials() throws JAXRException + { + rs = connection.getRegistryService(); + blm = rs.getBusinessLifeCycleManager(); + bqm = rs.getBusinessQueryManager(); + } + + public InternationalString getIString(String str) throws JAXRException + { + return blm.createInternationalString(str); + } + + /** + * Locale aware Search a business in the registry + */ + public void searchBusiness(String bizname) throws JAXRException + { + try + { + // Get registry service and business query manager + this.getJAXREssentials(); + + // Define find qualifiers and name patterns + Collection findQualifiers = new ArrayList(); + findQualifiers.add(FindQualifier.SORT_BY_NAME_ASC); + Collection namePatterns = new ArrayList(); + String pattern = "%" + bizname + "%"; + LocalizedString ls = blm.createLocalizedString(Locale.getDefault(), pattern); + namePatterns.add(ls); + + // Find based upon qualifier type and values + BulkResponse response = bqm.findOrganizations(findQualifiers, namePatterns, null, null, null, null); + + // check how many organisation we have matched + Collection orgs = response.getCollection(); + if (orgs == null) + { + log.debug(" -- Matched 0 orgs"); + + } + else + { + log.debug(" -- Matched " + orgs.size() + " organizations -- "); + + // then step through them + for (Iterator orgIter = orgs.iterator(); orgIter.hasNext();) + { + Organization org = (Organization)orgIter.next(); + log.debug("Org name: " + getName(org)); + log.debug("Org description: " + getDescription(org)); + log.debug("Org key id: " + getKey(org)); + checkUser(org); + checkServices(org); + } + } + } + finally + { + connection.close(); + } + + } + + protected RegistryService getRegistryService() throws JAXRException + { + assertNotNull(connection); + return connection.getRegistryService(); + } + + protected BusinessQueryManager getBusinessQueryManager() throws JAXRException + { + assertNotNull(connection); + if (rs == null) + rs = this.getRegistryService(); + return rs.getBusinessQueryManager(); + } + + protected BusinessLifeCycleManager getBusinessLifeCycleManager() throws JAXRException + { + assertNotNull(connection); + if (rs == null) + rs = this.getRegistryService(); + return rs.getBusinessLifeCycleManager(); + } + + private void checkServices(Organization org) throws JAXRException + { + // Display service and binding information + Collection services = org.getServices(); + for (Iterator svcIter = services.iterator(); svcIter.hasNext();) + { + Service svc = (Service)svcIter.next(); + log.debug(" Service name: " + getName(svc)); + log.debug(" Service description: " + getDescription(svc)); + + assertEquals("JBOSS JAXR Service", getName(svc)); + assertEquals("Services of XML Registry", getDescription(svc)); + + Collection serviceBindings = svc.getServiceBindings(); + for (Iterator sbIter = serviceBindings.iterator(); sbIter.hasNext();) + { + ServiceBinding sb = (ServiceBinding)sbIter.next(); + log.debug(" Binding Description: " + getDescription(sb)); + log.debug(" Access URI: " + sb.getAccessURI()); + assertEquals("http://testjboss.org", sb.getAccessURI()); + assertEquals("Test Service Binding", getDescription(sb)); + } + } + } + + private void checkUser(Organization org) throws JAXRException + { + // Display primary contact information + User pc = org.getPrimaryContact(); + if (pc != null) + { + PersonName pcName = pc.getPersonName(); + log.debug(" Contact name: " + pcName.getFullName()); + assertEquals("Anil S", pcName.getFullName()); + Collection phNums = pc.getTelephoneNumbers(pc.getType()); + for (Iterator phIter = phNums.iterator(); phIter.hasNext();) + { + TelephoneNumber num = (TelephoneNumber)phIter.next(); + log.debug(" Phone number: " + num.getNumber()); + } + Collection eAddrs = pc.getEmailAddresses(); + for (Iterator eaIter = eAddrs.iterator(); eaIter.hasNext();) + { + log.debug(" Email Address: " + (EmailAddress)eaIter.next()); + } + } + } + + private static String getName(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getName() != null) + { + return ro.getName().getValue(); + } + return ""; + } + + private static String getDescription(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getDescription() != null) + { + return ro.getDescription().getValue(); + } + return ""; + } + + private static String getKey(RegistryObject ro) throws JAXRException + { + if (ro != null && ro.getKey() != null) + { + return ro.getKey().getId(); + } + return ""; + } + + /** + * Creates a Jaxr Organization with 1 or more services + */ + protected Organization createOrganization(String orgname) throws JAXRException + { + Organization org = blm.createOrganization(getIString(orgname)); + org.setDescription(getIString("JBoss Inc")); + Service service = blm.createService(getIString("JBOSS JAXR Service")); + service.setDescription(getIString("Services of XML Registry")); + //Create serviceBinding + ServiceBinding serviceBinding = blm.createServiceBinding(); + serviceBinding.setDescription(blm.createInternationalString("Test Service Binding")); + + //Turn validation of URI off + serviceBinding.setValidateURI(false); + serviceBinding.setAccessURI("http://testjboss.org"); + + // Add the serviceBinding to the service + service.addServiceBinding(serviceBinding); + + User user = blm.createUser(); + org.setPrimaryContact(user); + PersonName personName = blm.createPersonName("Anil S"); + TelephoneNumber telephoneNumber = blm.createTelephoneNumber(); + telephoneNumber.setNumber("111-111-7777"); + telephoneNumber.setType(null); + PostalAddress address = blm.createPostalAddress("111", "My Drive", "BuckHead", "GA", "USA", "1111-111", ""); + Collection postalAddresses = new ArrayList(); + postalAddresses.add(address); + Collection emailAddresses = new ArrayList(); + EmailAddress emailAddress = blm.createEmailAddress(&quot;anil(a)apache.org&quot;); + emailAddresses.add(emailAddress); + + Collection numbers = new ArrayList(); + numbers.add(telephoneNumber); + user.setPersonName(personName); + user.setPostalAddresses(postalAddresses); + user.setEmailAddresses(emailAddresses); + user.setTelephoneNumbers(numbers); + + ClassificationScheme cScheme = getClassificationScheme("ntis-gov:naics", ""); + Key cKey = blm.createKey("uuid:C0B9FE13-324F-413D-5A5B-2004DB8E5CC2"); + cScheme.setKey(cKey); + Classification classification = blm.createClassification(cScheme, "Computer Systems Design and Related Services", "5415"); + org.addClassification(classification); + ClassificationScheme cScheme1 = getClassificationScheme("D-U-N-S", ""); + Key cKey1 = blm.createKey("uuid:3367C81E-FF1F-4D5A-B202-3EB13AD02423"); + cScheme1.setKey(cKey1); + ExternalIdentifier ei = blm.createExternalIdentifier(cScheme1, "D-U-N-S number", "08-146-6849"); + org.addExternalIdentifier(ei); + org.addService(service); + return org; + } + + /** + * Delete an Organization with a given key + */ + protected void deleteOrganization(Key orgkey) throws Exception + { + assertNotNull("Org Key is null?", orgkey); + if (blm == null) + blm = this.getBusinessLifeCycleManager(); + Collection keys = new ArrayList(); + keys.add(orgkey); + + BulkResponse response = blm.deleteOrganizations(keys); + Collection exceptions = response.getExceptions(); + assertNull("Deleting Org with Key=" + orgkey, exceptions); + } + + private ClassificationScheme getClassificationScheme(String str1, String str2) throws JAXRException + { + ClassificationScheme cs = blm.createClassificationScheme(getIString(str1), getIString(str2)); + return cs; + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,92 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.jaxr.scout.publish; - -// $Id$ - -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; - -import javax.xml.registry.BulkResponse; -import javax.xml.registry.JAXRException; -import javax.xml.registry.JAXRResponse; -import javax.xml.registry.infomodel.Key; -import javax.xml.registry.infomodel.Organization; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -/** - * Checks Deletion of Organization - * - * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana - * @since Jan 3, 2005 - */ -public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest -{ - public String saveOrg(String orgname) throws JAXRException - { - String keyid = ""; - login(); - - getJAXREssentials(); - Collection orgs = new ArrayList(); - Organization org = createOrganization("JBOSS"); - - orgs.add(org); - BulkResponse br = blm.saveOrganizations(orgs); - if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) - { - log.debug("Organization Saved"); - Collection coll = br.getCollection(); - Iterator iter = coll.iterator(); - while (iter.hasNext()) - { - Key key = (Key)iter.next(); - keyid = key.getId(); - log.debug("Saved Key=" + key.getId()); - assertNotNull(keyid); - }//end while - } - else - { - log.error("JAXRExceptions " + "occurred during save:"); - Collection exceptions = br.getExceptions(); - Iterator iter = exceptions.iterator(); - while (iter.hasNext()) - { - Exception e = (Exception)iter.next(); - log.error(e.toString()); - fail(e.toString()); - } - } - - return keyid; - } - - public void testDeleteOrgs() throws Exception - { - String keyid = this.saveOrg("DELETEORG"); - assertNotNull(keyid); - Key key = blm.createKey(keyid); - this.deleteOrganization(key); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrDeleteOrganizationTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,92 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.jaxr.scout.publish; + +// $Id$ + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +/** + * Checks Deletion of Organization + * + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Jan 3, 2005 + */ +public class JaxrDeleteOrganizationTestCase extends JaxrBaseTest +{ + public String saveOrg(String orgname) throws JAXRException + { + String keyid = ""; + login(); + + getJAXREssentials(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + log.debug("Organization Saved"); + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + log.debug("Saved Key=" + key.getId()); + assertNotNull(keyid); + }//end while + } + else + { + log.error("JAXRExceptions " + "occurred during save:"); + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + log.error(e.toString()); + fail(e.toString()); + } + } + + return keyid; + } + + public void testDeleteOrgs() throws Exception + { + String keyid = this.saveOrg("DELETEORG"); + assertNotNull(keyid); + Key key = blm.createKey(keyid); + this.deleteOrganization(key); + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,103 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.jaxr.scout.publish; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import javax.xml.registry.BulkResponse; -import javax.xml.registry.JAXRException; -import javax.xml.registry.JAXRResponse; -import javax.xml.registry.infomodel.Key; -import javax.xml.registry.infomodel.Organization; - -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; - -/** - * Tests Jaxr Save Organization - * - * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana - * @since Dec 29, 2004 - */ - -public class JaxrSaveOrganizationTestCase extends JaxrBaseTest -{ - private Key orgKey = null; - - public void testSaveOrg() throws JAXRException - { - String keyid = ""; - login(); - - rs = connection.getRegistryService(); - - blm = rs.getBusinessLifeCycleManager(); - Collection orgs = new ArrayList(); - Organization org = createOrganization("JBOSS"); - - orgs.add(org); - BulkResponse br = blm.saveOrganizations(orgs); - if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) - { - log.debug("Organization Saved"); - Collection coll = br.getCollection(); - Iterator iter = coll.iterator(); - while (iter.hasNext()) - { - Key key = (Key)iter.next(); - keyid = key.getId(); - log.debug("Saved Key=" + key.getId()); - assertNotNull(keyid); - }//end while - } - else - { - log.error("JAXRExceptions " + "occurred during save:"); - Collection exceptions = br.getExceptions(); - Iterator iter = exceptions.iterator(); - while (iter.hasNext()) - { - Exception e = (Exception)iter.next(); - log.error(e.toString()); - fail(e.toString()); - } - } - checkBusinessExists("JBOSS"); - } - - private void checkBusinessExists(String bizname) throws JAXRException - { - String request = "<find_business generic='2.0' xmlns='urn:uddi-org:api_v2'>" + "<name xml:lang='en'>" + bizname + "</name></find_business>"; - String response = rs.makeRegistrySpecificRequest(request); - if (response == null || "".equals(response)) - fail("Find Business failed"); - - } - - protected void tearDown() throws Exception - { - super.tearDown(); - if (this.orgKey != null) - this.deleteOrganization(orgKey); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/publish/JaxrSaveOrganizationTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.jaxr.scout.publish; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +/** + * Tests Jaxr Save Organization + * + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since Dec 29, 2004 + */ + +public class JaxrSaveOrganizationTestCase extends JaxrBaseTest +{ + private Key orgKey = null; + + public void testSaveOrg() throws JAXRException + { + String keyid = ""; + login(); + + rs = connection.getRegistryService(); + + blm = rs.getBusinessLifeCycleManager(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + log.debug("Organization Saved"); + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + log.debug("Saved Key=" + key.getId()); + assertNotNull(keyid); + }//end while + } + else + { + log.error("JAXRExceptions " + "occurred during save:"); + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + log.error(e.toString()); + fail(e.toString()); + } + } + checkBusinessExists("JBOSS"); + } + + private void checkBusinessExists(String bizname) throws JAXRException + { + String request = "<find_business generic='2.0' xmlns='urn:uddi-org:api_v2'>" + "<name xml:lang='en'>" + bizname + "</name></find_business>"; + String response = rs.makeRegistrySpecificRequest(request); + if (response == null || "".equals(response)) + fail("Find Business failed"); + + } + + protected void tearDown() throws Exception + { + super.tearDown(); + if (this.orgKey != null) + this.deleteOrganization(orgKey); + } +} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,94 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.jaxr.scout.query; - -/** Tests Jaxr capability to do business queries - * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana - * @since Dec 29, 2004 - */ - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; - -import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; - -import javax.xml.registry.BulkResponse; -import javax.xml.registry.JAXRException; -import javax.xml.registry.JAXRResponse; -import javax.xml.registry.infomodel.Key; -import javax.xml.registry.infomodel.Organization; - -public class JaxrBusinessQueryTestCase extends JaxrBaseTest -{ - protected String querystr = "JBOSS"; - - private Key orgKey = null; - - protected void setUp() throws Exception - { - super.setUp(); - String keyid = ""; - login(); - - getJAXREssentials(); - Collection orgs = new ArrayList(); - Organization org = createOrganization("JBOSS"); - - orgs.add(org); - BulkResponse br = blm.saveOrganizations(orgs); - if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) - { - Collection coll = br.getCollection(); - Iterator iter = coll.iterator(); - while (iter.hasNext()) - { - Key key = (Key)iter.next(); - keyid = key.getId(); - assertNotNull(keyid); - orgKey = key; - }//end while - } - else - { - Collection exceptions = br.getExceptions(); - Iterator iter = exceptions.iterator(); - while (iter.hasNext()) - { - Exception e = (Exception)iter.next(); - fail(e.toString()); - } - } - } - - protected void tearDown() throws Exception - { - if (orgKey != null) - this.deleteOrganization(this.orgKey); - super.tearDown(); - } - - public void testBusinessQuery() throws JAXRException - { - searchBusiness(querystr); - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/jaxr/scout/query/JaxrBusinessQueryTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.jaxr.scout.query; + +/** + * Tests Jaxr capability to do business queries + * + * @author <mailto:Anil.Saldhana@jboss.org>Anil Saldhana + * @since 29-Dec-2004 + */ +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; + +import org.jboss.test.ws.jaxws.samples.jaxr.scout.JaxrBaseTest; + +import javax.xml.registry.BulkResponse; +import javax.xml.registry.JAXRException; +import javax.xml.registry.JAXRResponse; +import javax.xml.registry.infomodel.Key; +import javax.xml.registry.infomodel.Organization; + +public class JaxrBusinessQueryTestCase extends JaxrBaseTest +{ + protected String querystr = "JBOSS"; + + private Key orgKey = null; + + protected void setUp() throws Exception + { + super.setUp(); + String keyid = ""; + login(); + + getJAXREssentials(); + Collection orgs = new ArrayList(); + Organization org = createOrganization("JBOSS"); + + orgs.add(org); + BulkResponse br = blm.saveOrganizations(orgs); + if (br.getStatus() == JAXRResponse.STATUS_SUCCESS) + { + Collection coll = br.getCollection(); + Iterator iter = coll.iterator(); + while (iter.hasNext()) + { + Key key = (Key)iter.next(); + keyid = key.getId(); + assertNotNull(keyid); + orgKey = key; + }//end while + } + else + { + Collection exceptions = br.getExceptions(); + Iterator iter = exceptions.iterator(); + while (iter.hasNext()) + { + Exception e = (Exception)iter.next(); + fail(e.toString()); + } + } + } + + protected void tearDown() throws Exception + { + if (orgKey != null) + this.deleteOrganization(this.orgKey); + super.tearDown(); + } + + public void testBusinessQuery() throws JAXRException + { + searchBusiness(querystr); + } +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/EJB3Client.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -60,7 +60,7 @@ // Test on method with value @WebServiceRef(name = "TestEndpointService5") - public void setServiceSetter5(TestEndpointService service) + public void setService5(TestEndpointService service) { this.service5 = service; } @@ -68,7 +68,7 @@ // Test on method without name @WebServiceRef - public void setServiceSetter6(TestEndpointService service) + public void setService6(TestEndpointService service) { this.service6 = service; } @@ -99,7 +99,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/serviceSetter6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp.ejb3/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp.ejb3/env/Port2")); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -57,7 +57,7 @@ // Test on method with value @WebServiceRef(name = "TestEndpointService5") - public void setServiceSetter5(TestEndpointService service) + public void setService5(TestEndpointService service) { this.service5 = service; } @@ -65,7 +65,7 @@ // Test on method without name @WebServiceRef - public void setServiceSetter6(TestEndpointService service) + public void setService6(TestEndpointService service) { this.service6 = service; } @@ -98,7 +98,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/serviceSetter6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + getClass().getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointClientOne.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -30,7 +30,7 @@ import org.jboss.logging.Logger; -//Test on type with wsdlLocation +// Test on type with wsdlLocation @WebServiceRef(name = "service1", value = TestEndpointService.class, wsdlLocation = "META-INF/wsdl/TestEndpoint.wsdl") // Test multiple on type @@ -52,7 +52,7 @@ // Test on method with name @WebServiceRef(name = "TestEndpointService5") - static void setServiceSetter5(TestEndpointService service) + static void setService5(TestEndpointService service) { TestEndpointClientOne.service5 = service; } @@ -60,7 +60,7 @@ // Test on method without name @WebServiceRef - static void setServiceSetter6(TestEndpointService service) + static void setService6(TestEndpointService service) { TestEndpointClientOne.service6 = service; } @@ -102,7 +102,7 @@ ports.add((TestEndpoint)service5.getPort(TestEndpoint.class)); ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/TestEndpointService5")).getTestEndpointPort()); ports.add((TestEndpoint)service6.getPort(TestEndpoint.class)); - ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/serviceSetter6")).getTestEndpointPort()); + ports.add(((TestEndpointService)iniCtx.lookup("java:comp/env/" + TestEndpointClientOne.class.getName() + "/service6")).getTestEndpointPort()); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/port1")); ports.add(port2); ports.add((TestEndpoint)iniCtx.lookup("java:comp/env/Port2")); Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity) Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,45 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.wssecurity; - -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebService; -import javax.jws.soap.SOAPBinding; - -import org.jboss.logging.Logger; -import org.jboss.ws.annotation.EndpointConfig; - -@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") -@EndpointConfig(configName = "Standard WSSecurity Endpoint") -@SOAPBinding(style = SOAPBinding.Style.RPC) -public class HelloJavaBean -{ - private Logger log = Logger.getLogger(HelloJavaBean.class); - - @WebMethod - public UserType echoUserType(@WebParam(name = "user") UserType in0) - { - log.info(in0); - return in0; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/HelloJavaBean.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,45 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import javax.jws.WebMethod; +import javax.jws.WebParam; +import javax.jws.WebService; +import javax.jws.soap.SOAPBinding; + +import org.jboss.logging.Logger; +import org.jboss.ws.annotation.EndpointConfig; + +@WebService(name = "Hello", targetNamespace = "http://org.jboss.ws/samples/wssecurity") +@EndpointConfig(configName = "Standard WSSecurity Endpoint") +@SOAPBinding(style = SOAPBinding.Style.RPC) +public class HelloJavaBean +{ + private Logger log = Logger.getLogger(HelloJavaBean.class); + + @WebMethod + public UserType echoUserType(@WebParam(name = "user") UserType in0) + { + log.info(in0); + return in0; + } +} Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,86 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.wssecurity; - -import java.io.File; -import java.net.URL; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.client.ServiceExt; - -/** - * Test WS-Security with RPC/Literal - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - * @version $Revision$ - */ -public class SimpleEncryptTestCase extends JBossWSTest -{ - /** Construct the test case with a given name - */ - - /** Deploy the test */ - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); - } - - /** - * Test JSE endpoint - */ - public void testEndpoint() throws Exception - { - Hello hello = getPort(); - - UserType in0 = new UserType(); - in0.setMsg("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals("Kermit", retObj.getMsg()); - } - - private Hello getPort() throws Exception - { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - - Service service = Service.create(wsdlURL, serviceName); - ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); - - Hello port = (Hello)service.getPort(Hello.class); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-encrypt"); - - return port; - } -} \ No newline at end of file Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleEncryptTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.io.File; +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.jaxws.client.ServiceExt; + +/** + * Test WS-Security with RPC/Literal + * + * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> + * @version $Revision$ + */ +public class SimpleEncryptTestCase extends JBossWSTest +{ + /** Construct the test case with a given name + */ + + /** Deploy the test */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(SimpleEncryptTestCase.class, "jaxws-samples-wssecurity-encrypt.war"); + } + + /** + * Test JSE endpoint + */ + public void testEndpoint() throws Exception + { + Hello hello = getPort(); + + UserType in0 = new UserType(); + in0.setMsg("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals("Kermit", retObj.getMsg()); + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + + Service service = Service.create(wsdlURL, serviceName); + ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); + + Hello port = (Hello)service.getPort(Hello.class); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-encrypt"); + + return port; + } +} \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.wssecurity; - -import java.io.File; -import java.net.URL; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.ws.BindingProvider; -import javax.xml.ws.Service; - -import junit.framework.Test; - -import org.jboss.test.ws.JBossWSTest; -import org.jboss.test.ws.JBossWSTestSetup; -import org.jboss.ws.core.StubExt; -import org.jboss.ws.core.jaxws.client.ServiceExt; - -/** - * Test WS-Security with RPC/Literal - * - * @author Thomas.Diesler(a)jboss.com - */ -public class SimpleSignTestCase extends JBossWSTest -{ - /** Deploy the test */ - public static Test suite() throws Exception - { - return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); - } - - /** - * Test JSE endpoint - */ - public void testEndpoint() throws Exception - { - Hello hello = getPort(); - - UserType in0 = new UserType(); - in0.setMsg("Kermit"); - UserType retObj = hello.echoUserType(in0); - assertEquals("Kermit", retObj.getMsg()); - } - - private Hello getPort() throws Exception - { - URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); - URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); - QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); - - Service service = Service.create(wsdlURL, serviceName); - ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); - - Hello port = (Hello)service.getPort(Hello.class); - ((StubExt)port).setConfigName("Standard WSSecurity Client"); - - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); - reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign"); - - return port; - } -} Copied: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java) =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java (rev 0) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/wssecurity/SimpleSignTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.ws.jaxws.samples.wssecurity; + +import java.io.File; +import java.net.URL; +import java.util.Map; + +import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; +import javax.xml.ws.Service; + +import junit.framework.Test; + +import org.jboss.test.ws.JBossWSTest; +import org.jboss.test.ws.JBossWSTestSetup; +import org.jboss.ws.core.StubExt; +import org.jboss.ws.core.jaxws.client.ServiceExt; + +/** + * Test WS-Security with RPC/Literal + * + * @author Thomas.Diesler(a)jboss.com + */ +public class SimpleSignTestCase extends JBossWSTest +{ + /** Deploy the test */ + public static Test suite() throws Exception + { + return JBossWSTestSetup.newTestSetup(SimpleSignTestCase.class, "jaxws-samples-wssecurity-sign.war"); + } + + /** + * Test JSE endpoint + */ + public void testEndpoint() throws Exception + { + Hello hello = getPort(); + + UserType in0 = new UserType(); + in0.setMsg("Kermit"); + UserType retObj = hello.echoUserType(in0); + assertEquals("Kermit", retObj.getMsg()); + } + + private Hello getPort() throws Exception + { + URL wsdlURL = new File("wsprovide/resources/jaxws/samples/wssecurity/HelloService.wsdl").toURL(); + URL securityURL = new File("resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml").toURL(); + QName serviceName = new QName("http://org.jboss.ws/samples/wssecurity", "HelloService"); + + Service service = Service.create(wsdlURL, serviceName); + ((ServiceExt)service).setSecurityConfig(securityURL.toExternalForm()); + + Hello port = (Hello)service.getPort(Hello.class); + ((StubExt)port).setConfigName("Standard WSSecurity Client"); + + Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + reqContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, "http://" + getServerHost() + ":8080/jaxws-samples-wssecurity-sign"); + + return port; + } +} Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpoint.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,17 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.samples.xop.doclit; -import javax.ejb.Remote; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; import javax.xml.ws.BindingType; -@Remote @WebService(targetNamespace = "http://org.jboss.ws/xop/doclit") @SOAPBinding(style = SOAPBinding.Style.DOCUMENT, parameterStyle = SOAPBinding.ParameterStyle.BARE) -@BindingType(value="http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") -public interface MTOMEndpoint { +@BindingType(value = "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true") +public interface MTOMEndpoint +{ + public DHResponse echoDataHandler(DHRequest request); - public DHResponse echoDataHandler(DHRequest request); public ImageResponse echoImage(ImageRequest request); - public SourceResponse echoSource(SourceRequest request); + + public SourceResponse echoSource(SourceRequest request); } Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/MTOMEndpointBean.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,56 +1,55 @@ /* -* JBoss, Home of Professional Open Source -* Copyright 2005, JBoss Inc., and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ package org.jboss.test.ws.jaxws.samples.xop.doclit; import java.io.IOException; import javax.activation.DataHandler; -import javax.ejb.Stateless; import javax.jws.WebService; import org.jboss.ws.WSException; -@Stateless -@WebService(name="MTOMEndpoint", serviceName = "MTOMService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint") -public class MTOMEndpointBean implements MTOMEndpoint { - - public DHResponse echoDataHandler(DHRequest request) { +@WebService(name = "MTOMEndpoint", serviceName = "MTOMService", endpointInterface = "org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpoint") +public class MTOMEndpointBean implements MTOMEndpoint +{ + public DHResponse echoDataHandler(DHRequest request) + { + DataHandler dataHandler = request.getDataHandler(); try { System.out.println("Recv " + dataHandler.getContentType()); - System.out.println("Content is "+ dataHandler.getContent()); + System.out.println("Content is " + dataHandler.getContent()); } catch (IOException e) { throw new WSException(e); } - return new DHResponse( request.getDataHandler() ); + return new DHResponse(request.getDataHandler()); } - public ImageResponse echoImage(ImageRequest request) { return new ImageResponse(request.getData()); Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -48,9 +48,15 @@ protected MTOMEndpoint port; protected SOAPBinding binding; - protected abstract MTOMEndpoint getPort(); + protected MTOMEndpoint getPort() + { + return port; + } - protected abstract SOAPBinding getBinding(); + protected SOAPBinding getBinding() + { + return binding; + } public void testDHRoundtrip() throws Exception { Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -42,12 +42,11 @@ */ public class XOPHandlerTestCase extends XOPBase { + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService"; - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMEndpointBean"; - public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxws-samples-xop-doclit.jar"); + return JBossWSTestSetup.newTestSetup(XOPHandlerTestCase.class, "jaxws-samples-xop-doclit.war"); } protected void setUp() throws Exception @@ -68,15 +67,4 @@ handlerChain.add(new MTOMProtocolHandler()); binding.setHandlerChain(handlerChain); } - - protected MTOMEndpoint getPort() - { - return port; - } - - protected SOAPBinding getBinding() - { - return binding; - } - } \ No newline at end of file Modified: trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java =================================================================== --- trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPTestCase.java 2007-02-16 14:02:27 UTC (rev 2385) @@ -39,11 +39,11 @@ public class XOPTestCase extends XOPBase { - public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMEndpointBean"; + public final String TARGET_ENDPOINT_ADDRESS = "http://" + getServerHost() + ":8080/jaxws-samples-xop-doclit/MTOMService"; public static Test suite() { - return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxws-samples-xop-doclit.jar"); + return JBossWSTestSetup.newTestSetup(XOPTestCase.class, "jaxws-samples-xop-doclit.war"); } protected void setUp() throws Exception @@ -60,15 +60,4 @@ binding.setMTOMEnabled(true); } - - protected MTOMEndpoint getPort() - { - return port; - } - - protected SOAPBinding getBinding() - { - return binding; - } - } \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/META-INF/jboss-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-doclit?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/doclit/handlerconfig/META-INF/jboss-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPHandlerTestCase</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-doclit_handler?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-doclit_handler?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/META-INF/jboss-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-rpclit?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF/jboss-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -9,7 +9,7 @@ <service-ref> <service-ref-name>service/XOPHandlerTestCaseRPC</service-ref-name> - <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-samples-xop-rpclit_handler?wsdl</wsdl-override> + <wsdl-override>http://@jbosstest.host.name@:8080/jaxrpc-xop-rpclit_handler?wsdl</wsdl-override> </service-ref> </jboss-client> Modified: trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/RegistrationService.wsdl 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,11 +1,11 @@ <!-- This wsdl is only used for client artifact generation -wsimport -keep -verbose -d ../../../java ./META-INF/wsdl/RegistrationService.wsdl +wsconsume -k -s src/main/java src/main/resources/jaxws/jsr181/complex/META-INF/wsdl/Registration.wsdl $Id$ --> -<definitions name="RegistrationServiceService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" +<definitions name="RegistrationService" targetNamespace="http://org.jboss.ws/jaxws/complex" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:ns1="http://complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:ns2="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/" xmlns:tns="http://org.jboss.ws/jaxws/complex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:jaxws="http://java.sun.com/xml/ns/jaxws" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"> @@ -30,9 +30,9 @@ <import namespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/"... <import namespace="http://complex.jsr181.jaxws.ws.test.jboss.org/"/> - <complexType name="AlreadyRegisteredException"> + <complexType name="AlreadyRegisteredFault"> <complexContent> - <extension base="ns2:RegistrationException"> + <extension base="ns2:RegistrationFault"> <sequence> <element name="existingId" type="long"/> </sequence> @@ -94,17 +94,17 @@ </sequence> </complexType> - <complexType name="ValidationException"> + <complexType name="ValidationFault"> <complexContent> - <extension base="ns2:RegistrationException"> + <extension base="ns2:RegistrationFault"> <sequence> - <element maxOccurs="unbounded" minOccurs="0" name="failiedCustomers" type="long"/> + <element maxOccurs="unbounded" minOccurs="0" name="failedCustomers" type="long"/> </sequence> </extension> </complexContent> </complexType> - <element name="AlreadyRegisteredException" type="tns:AlreadyRegisteredException"/> + <element name="AlreadyRegisteredFault" type="tns:AlreadyRegisteredFault"/> <element name="BulkRegister" type="tns:BulkRegister"/> <element name="BulkRegisterResponse" type="tns:BulkRegisterResponse"/> <element name="GetStatistics" type="tns:GetStatistics"/> @@ -113,7 +113,7 @@ <element name="RegisterForInvoice" type="tns:RegisterForInvoice"/> <element name="RegisterForInvoiceResponse" type="tns:RegisterForInvoiceResponse"/> <element name="RegisterResponse" type="tns:RegisterResponse"/> - <element name="ValidationException" type="tns:ValidationException"/> + <element name="ValidationFault" type="tns:ValidationFault"/> </schema> <schema elementFormDefault="qualified" targetNamespace="http://extra.complex.jsr181.jaxws.ws.test.jboss.org... xmlns="http://www.w3.org/2001/XMLSchema" @@ -199,70 +199,70 @@ </sequence> </complexType> - <complexType name="RegistrationException"> + <complexType name="RegistrationFault"> <sequence> <element name="message" nillable="true" type="string"/> </sequence> </complexType> - <element name="RegistrationException" type="tns:RegistrationException"/> + <element name="RegistrationFault" type="tns:RegistrationFault"/> </schema> </types> - <message name="RegistrationService_BulkRegister"> + <message name="Registration_BulkRegister"> <part element="tns:BulkRegister" name="parameters"/> </message> - <message name="RegistrationService_GetStatisticsResponse"> + <message name="Registration_GetStatisticsResponse"> <part element="tns:GetStatisticsResponse" name="result"/> </message> - <message name="AlreadyRegisteredException"> - <part element="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> + <message name="AlreadyRegisteredFault"> + <part element="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> </message> - <message name="ValidationException"> - <part element="tns:ValidationException" name="ValidationException"/> + <message name="ValidationFault"> + <part element="tns:ValidationFault" name="ValidationFault"/> </message> - <message name="RegistrationService_RegisterForInvoice"> + <message name="Registration_RegisterForInvoice"> <part element="tns:RegisterForInvoice" name="parameters"/> </message> - <message name="RegistrationService_RegisterResponse"> + <message name="Registration_RegisterResponse"> <part element="tns:RegisterResponse" name="result"/> </message> - <message name="RegistrationService_RegisterForInvoiceResponse"> + <message name="Registration_RegisterForInvoiceResponse"> <part element="tns:RegisterForInvoiceResponse" name="result"/> </message> - <message name="RegistrationService_BulkRegisterResponse"> + <message name="Registration_BulkRegisterResponse"> <part element="tns:BulkRegisterResponse" name="result"/> </message> - <message name="RegistrationService_GetStatistics"> + <message name="Registration_GetStatistics"> <part element="tns:GetStatistics" name="parameters"/> </message> - <message name="RegistrationService_Register"> + <message name="Registration_Register"> <part element="tns:Register" name="parameters"/> </message> - <portType name="RegistrationService"> + <portType name="Registration"> <operation name="BulkRegister"> - <input message="tns:RegistrationService_BulkRegister"/> - <output message="tns:RegistrationService_BulkRegisterResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_BulkRegister"/> + <output message="tns:Registration_BulkRegisterResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> <operation name="GetStatistics"> - <input message="tns:RegistrationService_GetStatistics"/> - <output message="tns:RegistrationService_GetStatisticsResponse"/> + <input message="tns:Registration_GetStatistics"/> + <output message="tns:Registration_GetStatisticsResponse"/> </operation> <operation name="Register"> - <input message="tns:RegistrationService_Register"/> - <output message="tns:RegistrationService_RegisterResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_Register"/> + <output message="tns:Registration_RegisterResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> <operation name="RegisterForInvoice"> - <input message="tns:RegistrationService_RegisterForInvoice"/> - <output message="tns:RegistrationService_RegisterForInvoiceResponse"/> - <fault message="tns:AlreadyRegisteredException" name="AlreadyRegisteredException"/> - <fault message="tns:ValidationException" name="ValidationException"/> + <input message="tns:Registration_RegisterForInvoice"/> + <output message="tns:Registration_RegisterForInvoiceResponse"/> + <fault message="tns:AlreadyRegisteredFault" name="AlreadyRegisteredFault"/> + <fault message="tns:ValidationFault" name="ValidationFault"/> </operation> </portType> - <binding name="RegistrationServiceBinding" type="tns:RegistrationService"> + <binding name="RegistrationBinding" type="tns:Registration"> <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> <operation name="BulkRegister"> <soap:operation soapAction=""/> @@ -272,11 +272,11 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> <operation name="GetStatistics"> @@ -296,11 +296,11 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> <operation name="RegisterForInvoice"> @@ -311,17 +311,17 @@ <output> <soap:body use="literal"/> </output> - <fault name="AlreadyRegisteredException"> - <soap:fault name="AlreadyRegisteredException" use="literal"/> + <fault name="AlreadyRegisteredFault"> + <soap:fault name="AlreadyRegisteredFault" use="literal"/> </fault> - <fault name="ValidationException"> - <soap:fault name="ValidationException" use="literal"/> + <fault name="ValidationFault"> + <soap:fault name="ValidationFault" use="literal"/> </fault> </operation> </binding> - <service name="RegistrationServiceService"> - <port binding="tns:RegistrationServiceBinding" name="RegistrationServicePort"> - <soap:address location="http://tdvaio:8080/jaxws-jsr181-complex/RegistrationService"/> + <service name="RegistrationService"> + <port binding="tns:RegistrationBinding" name="RegistrationPort"> + <soap:address location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/Registration"/> </port> </service> </definitions> \ No newline at end of file Modified: trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/WEB-INF/web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -7,7 +7,7 @@ <servlet> <servlet-name>RegistrationService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationService</servlet-class> + <servlet-class>org.jboss.test.ws.jaxws.jsr181.complex.RegistrationServiceImpl</servlet-class> </servlet> <servlet-mapping> <servlet-name>RegistrationService</servlet-name> Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - -wscompile -import -keep -mapping jaxrpc-mapping.xml config.xml -Modify wrapper types to be DocWrappedService_(wrapper type name)_Request|ResponseStruct. ---> - -<configuration xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> -<wsdl location="http://@jbosstest.host.name@:8080/jaxws-jsr181-complex/RegistrationService?wsdl" packageName="org.jboss.test.ws.jaxws.jsr181.complex.client"/> -</configuration> Deleted: trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/jsr181/complex/jaxrpc-mapping.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,377 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"> -<package-mapping> -<package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> -</package-mapping> -<package-mapping> -<package-type>org.jboss.test.ws.jaxws.jsr181.complex.client</package-type> -<namespaceURI>http://extra.complex.jsr181.jaxws.ws.test.jboss.org/</namespaceURI> -</package-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Register</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customer</java-variable-name> -<xml-element-name>Customer</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>when</java-variable-name> -<xml-element-name>When</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</java-type> -<root-type-qname xmlns:typeNS="http://extra.complex.jsr181.jaxws.ws.test.jboss.org/&q... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>activationTime</java-variable-name> -<xml-element-name>activationTime</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>hits</java-variable-name> -<xml-element-name>hits</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>address</java-variable-name> -<xml-element-name>address</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>contactNumbers</java-variable-name> -<xml-element-name>contactNumbers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>id</java-variable-name> -<xml-element-name>id</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>name</java-variable-name> -<xml-element-name>name</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>referredCustomers</java-variable-name> -<xml-element-name>referredCustomers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>cycleDay</java-variable-name> -<xml-element-name>cycleDay</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegister</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customers</java-variable-name> -<xml-element-name>Customers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>when</java-variable-name> -<xml-element-name>When</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>message</java-variable-name> -<xml-element-name>message</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>failiedCustomers</java-variable-name> -<xml-element-name>failiedCustomers</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Address</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>city</java-variable-name> -<xml-element-name>city</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>state</java-variable-name> -<xml-element-name>state</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>street</java-variable-name> -<xml-element-name>street</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>zip</java-variable-name> -<xml-element-name>zip</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Name</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>firstName</java-variable-name> -<xml-element-name>firstName</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>lastName</java-variable-name> -<xml-element-name>lastName</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>middleName</java-variable-name> -<xml-element-name>middleName</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.BulkRegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>registeredIDs</java-variable-name> -<xml-element-name>RegisteredIDs</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.PhoneNumber</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>areaCode</java-variable-name> -<xml-element-name>areaCode</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>exchange</java-variable-name> -<xml-element-name>exchange</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>line</java-variable-name> -<xml-element-name>line</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoiceResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>done</java-variable-name> -<xml-element-name>done</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterForInvoice</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>invoiceCustomer</java-variable-name> -<xml-element-name>InvoiceCustomer</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.RegisterResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>registeredID</java-variable-name> -<xml-element-name>RegisteredID</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatistics</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>customer</java-variable-name> -<xml-element-name>Customer</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.GetStatisticsResponse</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>statistics</java-variable-name> -<xml-element-name>Statistics</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>address</java-variable-name> -<xml-element-name>address</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>contactNumbers</java-variable-name> -<xml-element-name>contactNumbers</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>id</java-variable-name> -<xml-element-name>id</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>name</java-variable-name> -<xml-element-name>name</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>referredCustomers</java-variable-name> -<xml-element-name>referredCustomers</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</java-type> -<root-type-qname xmlns:typeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&g... -<qname-scope>complexType</qname-scope> -<variable-mapping> -<java-variable-name>message</java-variable-name> -<xml-element-name>message</xml-element-name> -</variable-mapping> -<variable-mapping> -<java-variable-name>existingId</java-variable-name> -<xml-element-name>existingId</xml-element-name> -</variable-mapping> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegister&gt;Customers[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>long[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:BulkRegisterResponse&gt;RegisteredIDs[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<java-xml-type-mapping> -<java-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</java-type> -<anonymous-type-qname>http://complex.jsr181.jaxws.ws.test.jboss.org/:Customer&gt;referredCustomers[0,unbounded]</anonymous-type-qname> -<qname-scope>complexType</qname-scope> -</java-xml-type-mapping> -<exception-mapping> -<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.ValidationException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... -<constructor-parameter-order> -<element-name>message</element-name> -<element-name>failiedCustomers</element-name> -</constructor-parameter-order> -</exception-mapping> -<exception-mapping> -<exception-type>org.jboss.test.ws.jaxws.jsr181.complex.client.AlreadyRegisteredException</exception-type> -<wsdl-message xmlns:exMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"&... -<constructor-parameter-order> -<element-name>message</element-name> -<element-name>existingId</element-name> -</constructor-parameter-order> -</exception-mapping> -<service-interface-mapping> -<service-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationServiceService</service-interface> -<wsdl-service-name xmlns:serviceNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<port-mapping> -<port-name>RegistrationServicePort</port-name> -<java-port-name>RegistrationServicePort</java-port-name> -</port-mapping> -</service-interface-mapping> -<service-endpoint-interface-mapping> -<service-endpoint-interface>org.jboss.test.ws.jaxws.jsr181.complex.client.RegistrationService</service-endpoint-interface> -<wsdl-port-type xmlns:portTypeNS="http://complex.jsr181.jaxws.ws.test.jboss.org/&quo... -<wsdl-binding xmlns:bindingNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<service-endpoint-method-mapping> -<java-method-name>bulkRegister</java-method-name> -<wsdl-operation>BulkRegister</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer[]</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customers</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<method-param-parts-mapping> -<param-position>1</param-position> -<param-type>java.util.Calendar</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>When</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>long[]</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>RegisteredIDs</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>getStatistics</java-method-name> -<wsdl-operation>GetStatistics</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customer</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>org.jboss.test.ws.jaxws.jsr181.complex.client.Statistics</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Statistics</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>register</java-method-name> -<wsdl-operation>Register</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.Customer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>Customer</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<method-param-parts-mapping> -<param-position>1</param-position> -<param-type>java.util.Calendar</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>When</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>long</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>RegisteredID</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -<service-endpoint-method-mapping> -<java-method-name>registerForInvoice</java-method-name> -<wsdl-operation>RegisterForInvoice</wsdl-operation> -<wrapped-element/> -<method-param-parts-mapping> -<param-position>0</param-position> -<param-type>org.jboss.test.ws.jaxws.jsr181.complex.client.InvoiceCustomer</param-type> -<wsdl-message-mapping> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>InvoiceCustomer</wsdl-message-part-name> -<parameter-mode>IN</parameter-mode> -</wsdl-message-mapping> -</method-param-parts-mapping> -<wsdl-return-value-mapping> -<method-return-value>boolean</method-return-value> -<wsdl-message xmlns:wsdlMsgNS="http://complex.jsr181.jaxws.ws.test.jboss.org/"... -<wsdl-message-part-name>done</wsdl-message-part-name> -</wsdl-return-value-mapping> -</service-endpoint-method-mapping> -</service-endpoint-interface-mapping> -</java-wsdl-mapping> Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -49,7 +49,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss-web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -49,7 +49,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.ServletClient/service6</service-ref-name> <wsdl-override>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/webserviceref/META-INF/jboss.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -52,7 +52,7 @@ @WebServiceRef --> <service-ref> - <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/serviceSetter6</service-ref-name> + <service-ref-name>org.jboss.test.ws.jaxws.samples.webserviceref.EJB3Client/service6</service-ref-name> <wsdl-override>META-INF/wsdl/TestEndpoint.wsdl</wsdl-override> </service-ref> Modified: trunk/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wsaddressing/WEB-INF/jaxws-handlers.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,14 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<handler-chains xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee javaee_web_services_1_2.xsd"> - - <handler-chain> + + <handler-chain> <protocol-bindings>##SOAP11_HTTP</protocol-bindings> - <handler> - <handler-name>Application Server Handler</handler-name> - <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> - </handler> - </handler-chain> + <handler> + <handler-name>Application Server Handler</handler-name> + <handler-class>org.jboss.test.ws.jaxws.samples.wsaddressing.ServerHandler</handler-class> + </handler> + </handler-chain> </handler-chains> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> - <types> - <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> - <xs:complexType name='UserType'> - <xs:sequence> - <xs:element minOccurs='0' name='msg' type='xs:string'/> - </xs:sequence> - </xs:complexType> - </xs:schema> - </types> - <message name='Hello_echoUserType'> - <part name='user' type='tns:UserType'/> - </message> - <message name='Hello_echoUserTypeResponse'> - <part name='return' type='tns:UserType'/> - </message> - <portType name='Hello'> - <operation name='echoUserType' parameterOrder='user'> - <input message='tns:Hello_echoUserType'/> - <output message='tns:Hello_echoUserTypeResponse'/> - </operation> - </portType> - <binding name='HelloBinding' type='tns:Hello'> - <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> - <operation name='echoUserType'> - <soap:operation soapAction=''/> - <input> - <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> - </input> - <output> - <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> - </output> - </operation> - </binding> - <service name='HelloService'> - <port binding='tns:HelloBinding' name='HelloPort'> - <soap:address location='REPLACE_WITH_ACTUAL_URL'/> - </port> - </service> -</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/META-INF/wsdl/HelloService.wsdl 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name='HelloService' targetNamespace='http://org.jboss.ws/samples/wssecurity' xmlns='http://schemas.xmlsoap.org/wsdl/' xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/' xmlns:tns='http://org.jboss.ws/samples/wssecurity' xmlns:xsd='http://www.w3.org/2001/XMLSchema'> + <types> + <xs:schema targetNamespace='http://org.jboss.ws/samples/wssecurity' version='1.0' xmlns:xs='http://www.w3.org/2001/XMLSchema'> + <xs:complexType name='UserType'> + <xs:sequence> + <xs:element minOccurs='0' name='msg' type='xs:string'/> + </xs:sequence> + </xs:complexType> + </xs:schema> + </types> + <message name='Hello_echoUserType'> + <part name='user' type='tns:UserType'/> + </message> + <message name='Hello_echoUserTypeResponse'> + <part name='return' type='tns:UserType'/> + </message> + <portType name='Hello'> + <operation name='echoUserType' parameterOrder='user'> + <input message='tns:Hello_echoUserType'/> + <output message='tns:Hello_echoUserTypeResponse'/> + </operation> + </portType> + <binding name='HelloBinding' type='tns:Hello'> + <soap:binding style='rpc' transport='http://schemas.xmlsoap.org/soap/http'/> + <operation name='echoUserType'> + <soap:operation soapAction=''/> + <input> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </input> + <output> + <soap:body namespace='http://org.jboss.ws/samples/wssecurity' use='literal'/> + </output> + </operation> + </binding> + <service name='HelloService'> + <port binding='tns:HelloBinding' name='HelloPort'> + <soap:address location='REPLACE_WITH_ACTUAL_URL'/> + </port> + </service> +</definitions> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>HelloService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>HelloService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/WEB-INF/web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>HelloService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.wssecurity.HelloJavaBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>HelloService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> + Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <config> - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/META-INF/jboss-wsse-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>jbossws</trust-store-password> - <config> - <encrypt type="x509v3" alias="wsse"/> - <requires> - <encryption/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-encrypt/WEB-INF/jboss-wsse-server.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <encrypt type="x509v3" alias="wsse"/> + <requires> + <encryption/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <config> - <sign type="x509v3" alias="wsse"/> - <requires> - <signature/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/META-INF/jboss-wsse-client.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <config> + <sign type="x509v3" alias="wsse"/> + <requires> + <signature/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml 2007-02-13 17:21:18 UTC (rev 2352) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> - <key-store-file>WEB-INF/wsse.keystore</key-store-file> - <key-store-password>jbossws</key-store-password> - <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> - <trust-store-password>jbossws</trust-store-password> - <config> - <sign type="x509v3" alias="wsse"/> - <requires> - <signature/> - </requires> - </config> -</jboss-ws-security> \ No newline at end of file Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/simple-sign/WEB-INF/jboss-wsse-server.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<jboss-ws-security xmlns="http://www.jboss.com/ws-security/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.jboss.com/ws-security/config http://www.jboss.com/ws-security/schema/jboss-ws-security_1_0.xsd"> + <key-store-file>WEB-INF/wsse.keystore</key-store-file> + <key-store-password>jbossws</key-store-password> + <trust-store-file>WEB-INF/wsse.truststore</trust-store-file> + <trust-store-password>jbossws</trust-store-password> + <config> + <sign type="x509v3" alias="wsse"/> + <requires> + <signature/> + </requires> + </config> +</jboss-ws-security> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.keystore) =================================================================== (Binary files differ) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore (from rev 2352, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/wssecurity/wsse.truststore) =================================================================== (Binary files differ) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit) Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF) Deleted: trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-02-16 12:12:28 UTC (rev 2382) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <servlet> - <servlet-name>MTOMService</servlet-name> - <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>MTOMService</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> -</web-app> - Copied: trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml (from rev 2382, branches/jbossws-1.2.0/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml) =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml (rev 0) +++ trunk/jbossws-tests/src/main/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<web-app xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" + version="2.4"> + + <servlet> + <servlet-name>MTOMService</servlet-name> + <servlet-class>org.jboss.test.ws.jaxws.samples.xop.doclit.MTOMEndpointBean</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>MTOMService</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> +</web-app> + Deleted: trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/action/META-INF/config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wscompile -cp ../../../../output/classes -gen:server -f:rpcliteral -mapping jaxrpc-mapping.xml config.xml ---> - -<configuration - xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config"> - - <service name="ActionRpcService" - targetNamespace="http://org.jboss.ws/addressing/action" - typeNamespace="http://org.jboss.ws/addressing/action" - packageName="org.jboss.test.ws.jaxws.wsaddressing.action"> - <interface name="org.jboss.test.ws.jaxws.wsaddressing.action.ActionEndpoint"/> - </service> - -</configuration> - Deleted: trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/Initial-META-INF/wstools-config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> - </global> - <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-initial/InitialService?wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> \ No newline at end of file Deleted: trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml =================================================================== --- trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF/wstools-config.xml 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!-- - wstools -config wstools-config.xml ---> - -<configuration xmlns="http://www.jboss.org/jbossws-tools" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd"> - - <global> - <package-namespace package="org.jboss.test.ws.jaxws.wsaddressing.replyto" namespace="http://org.jboss.ws/addressing/replyto"/> - </global> - <wsdl-java location="http://localhost:8080/jaxws-wsaddressing-replyto/ReplyToService?wsdl"> - <mapping file="jaxrpc-mapping.xml" /> - </wsdl-java> - -</configuration> Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-02-16 14:02:27 UTC (rev 2385) @@ -1,5 +1,6 @@ # Always excludes -org/jboss/test/ws/interop/microsoft/** +org/jboss/test/ws/interop/** +org/jboss/test/ws/benchmark/** # Fix before JBoss50 goes final org/jboss/test/ws/jaxrpc/jbas897/JBAS897TestCase.* Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-16 13:52:43 UTC (rev 2384) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-02-16 14:02:27 UTC (rev 2385) @@ -19,12 +19,9 @@ org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.* org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/*TestCase.* +org/jboss/test/ws/jaxws/samples/jaxr/** # TODO: Why are these excluded # [JBWS-1471] - Remove unwanted tomcat excludes org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* org/jboss/test/ws/jaxws/samples/wseventing/** - -# [JBWS-1503] - Support XOP samples in tomcat -org/jboss/test/ws/jaxrpc/samples/xop/** -org/jboss/test/ws/jaxws/samples/xop/**