August 2007 - jbossws-commits - Jboss List Archives

JBossWS SVN: r4207 - in stack: metro/trunk/ant-import and 8 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 11:55:26 -0400 (Sat, 04 Aug 2007) New Revision: 4207 Added: stack/native/trunk/src/main/distro/ stack/native/trunk/src/main/distro/Install.txt stack/native/trunk/src/main/distro/ReleaseNotes.txt stack/native/trunk/src/main/distro/ant.properties.example stack/native/trunk/src/main/distro/bin-dist-build.xml stack/native/trunk/src/main/distro/bin-dist-deploy.xml Removed: stack/native/trunk/src/main/etc/bin-dist-build.xml stack/native/trunk/src/main/etc/bin-dist-deploy.xml Modified: stack/cxf/trunk/ant-import/build-testsuite.xml stack/metro/trunk/ant-import/build-testsuite.xml stack/native/trunk/ant-import-tests/build-testsuite.xml stack/native/trunk/ant-import/build-bin-dist.xml stack/native/trunk/build.xml stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java stack/native/trunk/tools/ant/README_JDK6.txt Log: Fix native bin distro Modified: stack/cxf/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/cxf/trunk/ant-import/build-testsuite.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/cxf/trunk/ant-import/build-testsuite.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -43,6 +43,7 @@ <path id="tests.extra.classpath"> <pathelement location="${int.xfire.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${int.xfire.dir}/thirdparty/jaxws-tools.jar"/> </path> </target> Modified: stack/metro/trunk/ant-import/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import/build-testsuite.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/metro/trunk/ant-import/build-testsuite.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -47,6 +47,7 @@ <path id="tests.extra.classpath"> <pathelement location="${int.sunri.dir}/thirdparty/jbossws-framework.jar"/> <pathelement location="${int.sunri.dir}/output/lib/jbossws-sunri-client.jar"/> + <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> </path> </target> Modified: stack/native/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/native/trunk/ant-import/build-bin-dist.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/ant-import/build-bin-dist.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -19,7 +19,7 @@ <target name="build-bin-dist" depends="jars, javadoc" description="Build the binary distribution"> - <property name="bindist.dir" value="${native.output.dir}/jbossws-native-${version.id}"/> + <property name="bindist.dir" value="${core.output.dir}/jbossws-native-${version.id}"/> <property name="bindist.build.dir" value="${bindist.dir}/build"/> <property name="bindist.bin.dir" value="${bindist.dir}/bin"/> <property name="bindist.lib.dir" value="${bindist.dir}/lib"/> @@ -35,45 +35,24 @@ <mkdir dir="${bindist.tools.dir}"/>  - <copy tofile="${bindist.dir}/ant.properties" file="${build.dir}/dist/ant.properties.example"> + <copy tofile="${bindist.dir}/ant.properties" file="${core.distro.dir}/ant.properties.example"> <filterset> - <filtersfile file="${build.dir}/ant.properties"/> + <filtersfile file="${core.dir}/ant.properties"/> </filterset> </copy> - <copy tofile="${bindist.dir}/build.xml" file="${native.etc.dir}/bin-dist-build.xml"/> - <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${native.etc.dir}/bin-dist-deploy.xml"/> + <copy tofile="${bindist.dir}/version.properties" file="${core.dir}/version.properties"/> + <copy tofile="${bindist.dir}/build.xml" file="${core.distro.dir}/bin-dist-build.xml"/> + <copy tofile="${bindist.build.dir}/build-deploy.xml" file="${core.distro.dir}/bin-dist-deploy.xml"/>  <copy todir="${bindist.build.dir}"> - <fileset dir="${build.dir}"> - <include name="version.properties"/> - </fileset> - <fileset dir="${build.dir}/ant-import"> - <include name="build-testsuite.xml"/> - </fileset> <fileset dir="${core.dir}/ant-import"> <include name="macros-deploy-framework.xml"/> <include name="macros-deploy-native.xml"/> </fileset> - <fileset dir="${int.sunri.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-sunri.xml"/> - </fileset> - <fileset dir="${int.xfire.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> - <include name="macros-deploy-xfire.xml"/> - </fileset> - <fileset dir="${testsuite.dir}/ant-import"> - <include name="build-jars-jaxws.xml"/> - </fileset> </copy> - <copy todir="${bindist.bin.dir}"> - <fileset dir="${framework.dir}/src/main/etc"> - <include name="*.sh"/> - <include name="*.bat"/> - </fileset> - </copy> + <unzip dest="${bindist.bin.dir}" src="${thirdparty.dir}/jbossws-framework-scripts.zip"/> <copy todir="${bindist.bin.dir}"> <fileset dir="${core.dir}/src/main/etc"> @@ -84,34 +63,35 @@ <chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/> -  <copy todir="${bindist.docs.dir}" > - <fileset dir="${native.output.dir}"> + <fileset dir="${core.output.dir}"> <include name="apidocs/**"/> </fileset> </copy> <copy todir="${bindist.docs.dir}" filtering="yes"> - <fileset dir="${build.dir}/dist"> + <fileset dir="${core.distro.dir}"> <include name="Install.txt"/> <include name="ReleaseNotes.txt"/> </fileset> <filterset> - <filtersfile file="${build.dir}/version.properties"/> + <filtersfile file="${core.dir}/version.properties"/> </filterset> </copy> <copy todir="${bindist.docs.dir}"> - <fileset dir="${build.dir}/etc"> + <fileset dir="${core.etc.dir}"> <include name="JBossORG-EULA.txt"/> </fileset> </copy>  <copy todir="${bindist.lib.dir}" overwrite="true"> - <fileset dir="${framework.dir}/output/lib"> + <fileset dir="${thirdparty.dir}"> + <include name="jbossws-common.jar"/> <include name="jbossws-framework.jar"/> <include name="jbossws-framework-scripts.zip"/> + <include name="jbossws-spi.jar"/> </fileset> <fileset dir="${core.dir}/output/lib"> <include name="jboss-jaxrpc.jar"/> @@ -121,13 +101,13 @@ <include name="jbossws-core.jar"/> <include name="jbossws-core-scripts.zip"/> </fileset> - <fileset dir="${int.native.dir}/output/lib"> + <fileset dir="${core.dir}/output/lib"> <include name="jbossws-context.war"/> <include name="jbossws-native40.sar"/> <include name="jbossws-native42.sar"/> <include name="jbossws-native50.sar"/> </fileset> - <fileset dir="${core.dir}/thirdparty"> + <fileset dir="${thirdparty.dir}"> <include name="jbossws-jboss50.jar"/> <include name="jbossws-jboss50-deployer.zip"/> <include name="jbossws-jboss42.jar"/> @@ -141,32 +121,34 @@ <include name="jaxws-tools.jar"/> <include name="jaxws-rt.jar"/> <include name="stax-api.jar"/> - <include name="wsdl4j.jar"/> - <include name="streambuffer.jar"/> <include name="stax-ex.jar"/> + <include name="streambuffer.jar"/> + <include name="wsdl4j.jar"/> </fileset> </copy>  <copy todir="${bindist.tests.dir}" overwrite="true"> - <fileset dir="${testsuite.dir}/src"/> - <fileset dir="${int.native.dir}/src/test"/> + <fileset dir="${core.dir}/src/test-framework"/> + <fileset dir="${core.dir}/src/test"> + <include name="resources/test-excludes-*.txt"/> + </fileset> </copy>  <copy todir="${bindist.tools.dir}" overwrite="true"> - <fileset dir="${build.dir}/tools/ant"/> + <fileset dir="${core.dir}/tools/ant"/> </copy> <copy todir="${bindist.dir}" overwrite="true"> - <fileset dir="${build.dir}"> + <fileset dir="${core.dir}"> <include name="build.bat"/> <include name="build.sh"/> </fileset> </copy> <chmod file="${bindist.dir}/build.sh" perm="+x"/> - <zip destfile="${native.output.dir}/jbossws-native-${version.id}.zip"> - <fileset dir="${native.output.dir}" includes="jbossws-native-${version.id}/**"/> + <zip destfile="${core.output.dir}/jbossws-native-${version.id}.zip"> + <fileset dir="${core.output.dir}" includes="jbossws-native-${version.id}/**"/> </zip> </target> Modified: stack/native/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/ant-import-tests/build-testsuite.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -35,14 +35,16 @@ <pathelement location="${core.dir}/output/lib/jboss-saaj.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> - <pathelement location="${core.dir}/thirdparty/policy.jar"/> - <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${core.dir}/thirdparty/wstx.jar"/> </path> <path id="tests.extra.classpath"> <pathelement location="${core.dir}/thirdparty/jbossws-framework.jar"/> + <pathelement location="${core.dir}/thirdparty/jaxws-tools.jar"/> + <pathelement location="${core.dir}/thirdparty/policy.jar"/> <pathelement location="${core.dir}/thirdparty/qdox.jar"/> + <pathelement location="${core.dir}/thirdparty/stax-api.jar"/> + <pathelement location="${core.dir}/thirdparty/wsdl4j.jar"/> + <pathelement location="${core.dir}/thirdparty/wstx.jar"/> <pathelement location="${core.dir}/thirdparty/xmlunit.jar"/> </path> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/build.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -16,6 +16,7 @@ <property name="core.dir" value="${basedir}"/> <import file="${basedir}/ant-import/build-setup.xml"/> + <import file="${basedir}/ant-import/build-bin-dist.xml"/> <import file="${basedir}/ant-import/build-deploy.xml"/> <import file="${basedir}/ant-import/build-release.xml"/> <import file="${basedir}/ant-import/build-thirdparty.xml"/> @@ -23,9 +24,9 @@ <property name="core.src.dir" value="${core.dir}/src/main"/> <property name="core.etc.dir" value="${core.src.dir}/etc"/> + <property name="core.distro.dir" value="${core.src.dir}/distro"/> <property name="core.java.dir" value="${core.src.dir}/java"/> <property name="core.resources.dir" value="${core.src.dir}/resources"/> - <property name="core.samples.dir" value="${core.resources.dir}/samples"/> <property name="core.output.dir" value="${core.dir}/output"/> <property name="core.output.apidocs.dir" value="${core.output.dir}/apidocs"/> <property name="core.output.etc.dir" value="${core.output.dir}/etc"/> @@ -345,7 +346,7 @@   - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> <mkdir dir="${core.output.apidocs.dir}"/> <javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> Added: stack/native/trunk/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/src/main/distro/Install.txt (rev 0) +++ stack/native/trunk/src/main/distro/Install.txt 2007-08-04 15:55:26 UTC (rev 4207) @@ -0,0 +1,35 @@ + +(a)implementation.title@ +(a)implementation.url@ + +Version: jbossws-(a)version.id@ + +Installation instructions +========================= + +This distribution ships with JBoss binaries for JDK1.4 and JDK1.5. +Please make sure your chose the right distribution that fits your target JDK. + +In order to install JBossWS the following steps are necessary: + +1.) Copy ant.properties.examples to ant.properties +2.) Modify the target container location in ant.properties +3.) Execute one of the following + + ant deploy-jboss50 + ant deploy-jboss42 + ant deploy-jboss40 + ant deploy-jboss40-jdk14 + ant deploy-tomcat + +Please consult the wiki for detailed up to date install instructions +http://labs.jboss.com/portal/jbossws/ + +After the jbossws.sar is deployed you should be able to access JBossWS under +http://localhost:8080/jbossws + +If you have any questions, please post to the userforum: +http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 + +Enjoy, +The JBossWS Team \ No newline at end of file Added: stack/native/trunk/src/main/distro/ReleaseNotes.txt =================================================================== --- stack/native/trunk/src/main/distro/ReleaseNotes.txt (rev 0) +++ stack/native/trunk/src/main/distro/ReleaseNotes.txt 2007-08-04 15:55:26 UTC (rev 4207) @@ -0,0 +1,263 @@ + +(a)implementation.title@ +(a)implementation.url@ + +Version: jbossws-(a)version.id@ + +Release Notes +============= + +The wiki (http://labs.jboss.com/portal/jbossws/) is usally a good starting point. +It contains the User Guide and Quick Start instructions. + +A list of examples that accompany the UserGuide can be found in the tests directory +that ship with the distribution. + +If you have any questions, please post to the JBossWS User Forum +http://www.jboss.org/index.html?module=bb&op=viewforum&f=200 + +For details see the change log. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:changelog-panel + +For issues that are scheduled for future versions see the road map. +http://jira.jboss.com/jira/browse/JBWS?report=com.atlassian.jira.plugin.system.project:roadmap-panel + +What's new in jbossws-(a)version.id@ +---------------------------------- + +Feature Request + + * [JBWS-434] - Support sequences of anys in JAXRPC + * [JBWS-1460] - @XmlMimeType and @XmlAttachmentRef on SEI parameter declarations + * [JBWS-1518] - Add support for jdk-1.6 + * [JBWS-1597] - WSDL To Java - Add support for bound headers. + * [JBWS-1666] - Simplify jbosws jar dependencies + * [JBWS-1564] - Support swaRef with JAX-WS + * [JBWS-1618] - Make default context root for jaxws ejb endpoint configurable + * [JBWS-429] - WSDL To Java - Create Custom Holders for Custom types that define INOUT parameters and OUT parameters + * [JBWS-771] - Use part names that are friendly to .NET + +Bug + + * [JBWS-801] - Chunked transfer of large attachments + * [JBWS-805] - Fault code is always 'Client' + * [JBWS-859] - SOAPMessageUnMarshaller doesn't support HTTP server response [204] - No Content + * [JBWS-862] - Return SOAP Fault for invalid soap messages + * [JBWS-1093] - Deploying a war that also contains normal servlets the web.xml is modified as if they are all endpoints + * [JBWS-1263] - Addressing does not disable the mustUnderstand attribute, which causes HandlerchainBaseImple.checkMustUnderstand to fail + * [JBWS-1283] - Soap attachments were dropped on server responses. Attachment is added on a handler's handleResponse method; however it mysteriously disappeared on the outgoing soap message. + * [JBWS-1339] - @Security domain vs. <security-domain> + * [JBWS-1346] - wsa:ReplyTo alwayt null + * [JBWS-1403] - NumberFormatException When Using StubExt.PROPERTY_CLIENT_TIMEOUT + * [JBWS-1422] - NPE if @WebParam.name like "mX.." + * [JBWS-1439] - Jdk 1.6.0 Requests get the error "setProperty must be overridden by all subclasses of SOAPMessage" + * [JBWS-1446] - Invalid WSDL when a parameter of type Object is part of a webmethod + * [JBWS-1468] - @Resource WebServiceContext for jbossas-4.x + * [JBWS-1472] - Address in WSDL is now always replaced regardless of 'alwaysModifySOAPAddress' value. + * [JBWS-1511] - MessageFactory does not preserve comments + * [JBWS-1520] - No server response on invalid soap request + * [JBWS-1553] - fails to read operations for portType from different namespace + * [JBWS-1556] - @WebWservice does not work with class isolation + * [JBWS-1563] - WSDLDefinitionsFactory doesn't resolve schema references locally + * [JBWS-1566] - JBossWS-1.2.0.GA invalid wsdl generated when using @XmlSchema annotations on Types inheriting from >1 java package + * [JBWS-1579] - @EndpointConfig ignored on SEI + * [JBWS-1588] - Review jar in classpath for wsrunclient.sh + * [JBWS-1594] - Support certificate password different from keystore + * [JBWS-1595] - No typemapping for xsd:anyType with soap encoding + * [JBWS-1607] - WSDL To Java - document/literal, IN OUT parameter incorectly used as return type. + * [JBWS-1609] - Address in WSDL - Port value is -1 when server is requested with default port 80 + * [JBWS-1611] - SOAPAction is not sent in dispath requests + * [JBWS-1616] - Verify correct bahaviour of @WebService.wsdlLocation + * [JBWS-1619] - ServletEndpointContext.getHttpSession always creates HTTPSession + * [JBWS-1620] - Incorrect handling of MIME boundaries in MultipartRelatedDecoder + * [JBWS-1621] - wstools.sh contain the wrong client libs and will fail + * [JBWS-1622] - Multiple context root not supported + * [JBWS-1624] - JBossWS samples don't work with JMX authentication + * [JBWS-1625] - Calling SOAPPart.setContent() with a DOMSource containing an Element which is a SOAPElement the contents of the body are added twice. + * [JBWS-1627] - WSDL To Java - Array Unwrapping uses incorect case to reference array type. + * [JBWS-1647] - Text Node Preservation For Messages Sent Across The Wire + * [JBWS-1653] - Post-handler-chain not invoked for "Standard Client" configuration + * [JBWS-1657] - Error resolving swaref schema + * [JBWS-1658] - SwaRef fails with doclit/wrapped endpoints + * [JBWS-1659] - @XmlAttachmentRef ignored on method level + * [JBWS-1660] - Resolve swaref schema through entity resolver + * [JBWS-1680] - Dispatch.invoke does not throw a ProtocolException on Fault + * [JBWS-1690] - Review wstools scripts and jars copied to client. + * [JBWS-1691] - WSDL To Java - Initial Character of Service and SEI names should be upper case. + * [JBWS-1692] - SOAPElement.importNode() not supported + * [JBWS-1696] - MIssing wsdl4j.jar in scripts + * [JBWS-1697] - WSDL To Java - Incorrect handling of Simple types derived by restriction for holders. + * [JBWS-1698] - WSDL To Java - If fault name contains 'Fault' the generated Exception does not match the throws clause on the SEI + * [JBWS-1706] - SOAPConnection.get fails with ProtocolException + * [JBWS-1710] - StackOverflowError when calling SOAPDocument.createCDATASection + * [JBWS-1711] - NoClassDefFoundError: com/sun/xml/stream/buffer/XMLStreamBuffer + +Task + + * [JBWS-1661] - Update to jaxb-ri-2.1 + +Errata +------ + FIXME: [JBAS-3595] - Tomcat allows http access with transport guarantie CONFIDENTIAL + FIXME: [JBWEB-68] Servlet.init(ServletConfig) not called + FIXME: [JBCTS-540] EJB3 proxy does not implement the Home interface + FIXME: [JBWS-1312] Fix JMS transport in trunk + FIXME: [JBWS-1330] Fix jaxrpc wsse tests for jbossws-5.0 + FIXME: [JBWS-1397] Fix <wsdl-publish-location> for jboss-5.0.x + FIXME: [JBWS-1460] @XmlMimeType on SEI parameter declarations + FIXME: [JBWS-1617] JAXRPC doc/literal trims empty string + FIXME: [JBWS-751] Multiple schema imports with the same namespace + FIXME: [JBWS-798] Complete EventingTestCase + FIXME: [JBWS-981] Virtual host configuration for EJB endpoints + +Enjoy, +The JBossWS Team + +Previous Releases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +What's new in JBossWS-1.2.1 +--------------------------- +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 + +What's new in jbossws-1.0.4 +--------------------------- + +* [JBWS-660] XOP inline base64Binary and sign message +* [JBWS-779] Add webservices.xml support to wsdlTojava +* [JBWS-868] BPEL in jbossws-samples +* [JBWS-1113] Improve performance of Service.getPort() +* [JBWS-1178] Multiple virtual host and soap:address problem +* [JBWS-1182] Change wsdl-java@file to wsdl-java@location +* [JBWS-1200] Provide source download for GA release +* [JBWS-1261] Provide support for additional MTOM java types besides byte[] +* [JBWS-1299] Add support for wsdl-java@parameter-style +* [JBWS-1302] Use EAR name in context root for EJB endpoints +* [JBWS-1323] Add JBoss EULA +* Bug fixes + +Errata +------ + +* FIXME: [JBWS-1291] Fix JaxrpcMappingValidator +* FIXME: [JBWS-1292] Fix XOPElementRPCTestCase +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-269] Support attachments in Web Services Tools +* FIXME: [JBWS-434] Support sequences of anys +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-798] Complete EventingTestCase +* FIXME: [JBWS-940] Add wsdl-java support for jdk 1.4 typesafe enums + +What's new in jbossws-1.0.3 +---------------------------------- + +* [JBWS-983] Configure SOAPAction on the Call object +* [JBWS-1090] preventing override of webservices.xml when multiple web services are processed with wstools +* [JBWS-1160] XOP Inline base64 for doc/lit requests +* Bug fixes + +What's new in jbossws-1.0.2 +---------------------------------- + +* [JBWS-855] Provide MTOM for document/literal +* [JBWS-920] integrate wstools wsdl2java functionality +* [JBWS-921] integrate wstools java2wsdl functionality +* [JBWS-932] Performance bottleneck when marshalling array types +* Bug fixes + +What's new in jbossws-1.0.1 +---------------------------------- + +* [JBWS-776] WSDLToJava Support wildcards +* [JBWS-852] Integration with Mikrocontainer +* [JBWS-865] Support security annotations for EJB3 endpoints +* [JBWS-871] Arrays with JSR181 endpoints +* [JBWS-923] Complete MTOM for rpc/literal +* Bug fixes Added: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example (rev 0) +++ stack/native/trunk/src/main/distro/ant.properties.example 2007-08-04 15:55:26 UTC (rev 4207) @@ -0,0 +1,30 @@ +# +# A sample ant properties file +# +# $Id: ant.properties.example 3137 2007-05-18 13:41:57Z thomas.diesler(a)jboss.com $ + +# Optional JBoss Home +jboss50.home=(a)jboss50.home@ +jboss42.home=(a)jboss42.home@ +jboss40.home=(a)jboss40.home@ + +# The JBoss server under test. This can be [jboss50|jboss42|jboss40] +jbossws.integration.target=jboss42 + +# The JBoss settings +jboss.server.instance=default +jboss.bind.address=localhost + +# JBoss Repository +#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository +jboss.repository=http://repository.jboss.org + +# JBoss JMX invoker authentication +#jmx.authentication.username=admin +#jmx.authentication.password=admin + +# Java Compiler options +javac.debug=yes +javac.deprecation=no +javac.fail.onerror=yes +javac.verbose=no Copied: stack/native/trunk/src/main/distro/bin-dist-build.xml (from rev 4196, stack/native/trunk/src/main/etc/bin-dist-build.xml) =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-build.xml (rev 0) +++ stack/native/trunk/src/main/distro/bin-dist-build.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -0,0 +1,153 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project default="main" basedir="." name="JBossWS-Native"> + +  +  +  + + <property name="build.dir" value="${basedir}/build"/> + <property name="bin.dir" value="${basedir}/bin"/> + <property name="docs.dir" value="${basedir}/docs"/> + <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib"/> + <property name="tests.dir" value="${basedir}/tests"/> + <property name="tests.output.dir" value="${basedir}/output"/> + + <property file="${basedir}/ant.properties"/> + <property file="${basedir}/version.properties"/> + + <property name="jboss50.lib" value="${jboss50.home}/lib"/> + <property name="jboss50.client" value="${jboss50.home}/client"/> + <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> + <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> + <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> + <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> + + <property name="jboss42.lib" value="${jboss42.home}/lib"/> + <property name="jboss42.client" value="${jboss42.home}/client"/> + <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> + <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> + <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> + + <property name="jboss40.lib" value="${jboss40.home}/lib"/> + <property name="jboss40.client" value="${jboss40.home}/client"/> + <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> + <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> + <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + + <property name="jboss50.available.file" value="${jboss50.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"/> + + <available property="jboss50.available" file="${jboss50.available.file}"/> + <available property="jboss42.available" file="${jboss42.available.file}"/> + <available property="jboss40.available" file="${jboss40.available.file}"/> + + <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> + +  + <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> + <available classname="java.io.Console" property="HAVE_JDK_1.6"/> + + <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> + + <import file="${basedir}/build/build-deploy.xml"/> + <import file="${basedir}/build/macros-deploy-framework.xml"/> + <import file="${basedir}/build/macros-deploy-native.xml"/> + <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> + +  +  +  + + <target name="prepare"> + +  + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + +  + <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> + + <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jbossws-common.jar"/> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> + <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> + <pathelement location="${lib.dir}/jboss-jaxws.jar"/> + <pathelement location="${lib.dir}/jboss-saaj.jar"/> + <pathelement location="${lib.dir}/jbossws-core.jar"/> + <pathelement location="${lib.dir}/jbossws-client.jar"/> + </path> + + <path id="tests.extra.classpath"> + <pathelement location="${thirdparty.dir}/policy.jar"/> + </path> + + </target> + +  +  +  + + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> + </target> + +  +  +  + +  + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}"/> + </target> + + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> + <ant antfile="${tests.dir}/ant-import/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> + </target> + + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> + +  + <target name="jars-jboss50" depends="prepare"/> + <target name="jars-jboss42" depends="prepare"/> + <target name="jars-jboss40" depends="prepare"/> + +  +  +  + + <target name="clean" depends="prepare" description="Cleans up most generated files."> + <delete dir="${tests.output.dir}"/> + </target> + + <target name="clobber" depends="clean" description="Cleans up all generated files."> + </target> + + <target name="main" depends="most" description="Executes the default target (most)."/> + + <target name="most" depends="tests-main" description="Builds almost everything."/> + +</project> Copied: stack/native/trunk/src/main/distro/bin-dist-deploy.xml (from rev 4196, stack/native/trunk/src/main/etc/bin-dist-deploy.xml) =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml (rev 0) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + +<project> + +  +  +  + +  + <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50"> + <macro-deploy-native50 + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-framework + thirdpartylibs="${lib.dir}" + jbosshome="${jboss50.home}"/> + </target> + <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss50.home}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> + <macro-undeploy-native50/> + <macro-undeploy-framework jbosshome="${jboss50.home}"/> + </target> + +  + <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42"> + <macro-deploy-native42 + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + <macro-deploy-framework + thirdpartylibs="${lib.dir}" + jbosshome="${jboss42.home}"/> + </target> + <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-deploy-endorsed + jbosshome="${jboss42.home}" + thirdpartylibs="${lib.dir}"/> + </target> + +  + <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42"> + <macro-undeploy-native42/> + <macro-undeploy-framework jbosshome="${jboss42.home}"/> + </target> + <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> + <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> + </target> + +  + <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/> + + <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40"> + <macro-deploy-native40 + stacklibs="${lib.dir}" + thirdpartylibs="${lib.dir}"/> + + <macro-deploy-framework + thirdpartylibs="${lib.dir}" + jbosshome="${jboss40.home}"/> + </target> + + <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> + <macro-setup-native40-no-ejb3/> + <echo> + *********************************** + * JBossWS EJB3 support disabled * + * All EJB3 tests will fail. * + *********************************** + </echo> + </target> + +  + <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> + <macro-undeploy-native40/> + <macro-undeploy-framework jbosshome="${jboss40.home}"/> + </target> + +</project> Deleted: stack/native/trunk/src/main/etc/bin-dist-build.xml =================================================================== --- stack/native/trunk/src/main/etc/bin-dist-build.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/src/main/etc/bin-dist-build.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -1,155 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project default="main" basedir="." name="JBossWS-Native"> - -  -  -  - - <property name="build.dir" value="${basedir}/build"/> - <property name="bin.dir" value="${basedir}/bin"/> - <property name="docs.dir" value="${basedir}/docs"/> - <property name="lib.dir" value="${basedir}/lib"/> - <property name="thirdparty.dir" value="${basedir}/lib"/> - <property name="tests.dir" value="${basedir}/tests"/> - <property name="tests.output.dir" value="${tests.dir}/output"/> - - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> - <property file="${build.dir}/version.properties"/> - - <property name="jboss50.lib" value="${jboss50.home}/lib"/> - <property name="jboss50.client" value="${jboss50.home}/client"/> - <property name="jboss50.server" value="${jboss50.home}/server/${jboss.server.instance}"/> - <property name="jboss50.server.lib" value="${jboss50.server}/lib"/> - <property name="jboss50.server.deploy" value="${jboss50.server}/deploy"/> - <property name="jboss50.server.deployers" value="${jboss50.server}/deployers"/> - - <property name="jboss42.lib" value="${jboss42.home}/lib"/> - <property name="jboss42.client" value="${jboss42.home}/client"/> - <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/> - <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> - <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> - - <property name="jboss40.lib" value="${jboss40.home}/lib"/> - <property name="jboss40.client" value="${jboss40.home}/client"/> - <property name="jboss40.server" value="${jboss40.home}/server/${jboss.server.instance}"/> - <property name="jboss40.server.lib" value="${jboss40.server}/lib"/> - <property name="jboss40.server.deploy" value="${jboss40.server}/deploy"/> - - <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> - - <property name="jboss50.available.file" value="${jboss50.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"/> - - <available property="jboss50.available" file="${jboss50.available.file}"/> - <available property="jboss42.available" file="${jboss42.available.file}"/> - <available property="jboss40.available" file="${jboss40.available.file}"/> - - <available property="jboss40.ejb3.available" file="${jboss40.client}/jboss-ejb3-client.jar"/> - -  - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <available classname="java.io.Console" property="HAVE_JDK_1.6"/> - - <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/> - - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/macros-deploy-spi.xml"/> - <import file="${basedir}/build/macros-deploy-native.xml"/> - <import file="${basedir}/build/macros-deploy-sunri.xml"/> - <import file="${basedir}/build/macros-deploy-xfire.xml"/> - -  -  -  - - <target name="prepare"> - -  - <condition property="jboss.home" value="${jboss50.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> - </condition> - <condition property="jboss.home" value="${jboss42.home}"> - <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> - </condition> - -  - <property name="excludesfile" value="${tests.dir}/resources/test-excludes-${jbossws.integration.target}.txt"/> - - </target> - - <target name="tests-init" depends="prepare,tests-classpath"> - - <path id="ws.stack.classpath"> - <pathelement location="${lib.dir}/jbossws-framework.jar"/> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> - <pathelement location="${lib.dir}/jboss-jaxrpc.jar"/> - <pathelement location="${lib.dir}/jboss-jaxws.jar"/> - <pathelement location="${lib.dir}/jboss-saaj.jar"/> - <pathelement location="${lib.dir}/jbossws-core.jar"/> - <pathelement location="${lib.dir}/jbossws-client.jar"/> - </path> - - <path id="tests.extra.classpath"> - <pathelement location="${thirdparty.dir}/policy.jar"/> - </path> - - </target> - -  -  -  - - <target name="tests-compile" depends="tests-init" description="Compile sources"> - <macro-compile-classes srcdir="${tests.dir}/java" excludesfile="${excludesfile}"/> - </target> - -  -  -  - -  - <target name="tests-copy-resources" depends="tests-init"> - <macro-copy-resources srcdir="${tests.dir}"/> - </target> - - <target name="tests-jars" depends="tests-compile,tests-copy-resources"> - <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> - </target> - - <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> - -  - <target name="jars-jboss50" depends="prepare"/> - <target name="jars-jboss42" depends="prepare"/> - <target name="jars-jboss40" depends="prepare"/> - -  -  -  - - <target name="clean" depends="prepare" description="Cleans up most generated files."> - </target> - - <target name="clobber" depends="clean" description="Cleans up all generated files."> - </target> - - <target name="main" depends="most" description="Executes the default target (most)."/> - - <target name="most" depends="tests-main" description="Builds almost everything."/> - -</project> Deleted: stack/native/trunk/src/main/etc/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/etc/bin-dist-deploy.xml 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/src/main/etc/bin-dist-deploy.xml 2007-08-04 15:55:26 UTC (rev 4207) @@ -1,112 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - - - - - - - - -<project> - -  -  -  - -  - <target name="deploy-jboss50" depends="undeploy-jboss50,deploy-jboss50-endorsed" description="Deploy jbossws/native to jboss50"> - <macro-undeploy-sunri50/> - <macro-undeploy-xfire50/> - <macro-deploy-native50 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - <macro-deploy-spi - spilibs="${lib.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss50.home}"/> - </target> - <target name="deploy-jboss50-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed - jbosshome="${jboss50.home}" - corelibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - </target> - -  - <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/native from jboss50"> - <macro-undeploy-native50/> - <macro-undeploy-spi jbosshome="${jboss50.home}"/> - </target> - -  - <target name="deploy-jboss42" depends="undeploy-jboss42,deploy-jboss42-endorsed" description="Deploy jbossws/native to jboss42"> - <macro-undeploy-sunri42/> - <macro-undeploy-xfire42/> - <macro-deploy-native42 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - <macro-deploy-spi - spilibs="${lib.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss42.home}"/> - </target> - <target name="deploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed - jbosshome="${jboss42.home}" - corelibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - </target> - -  - <target name="undeploy-jboss42" depends="prepare,undeploy-jboss42-endorsed" description="Remove jbossws/native from jboss42"> - <macro-undeploy-native42/> - <macro-undeploy-spi jbosshome="${jboss42.home}"/> - </target> - <target name="undeploy-jboss42-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss42.home}"/> - </target> - -  - <target name="deploy-jboss40" depends="deploy-jboss40-no-ejb3" description="Deploy jbossws/native to jboss40"/> - - <target name="deploy-jboss40-ejb3" depends="undeploy-jboss40"> - <macro-deploy-native40 - spilibs="${lib.dir}" - jbosslibs="${lib.dir}" - corelibs="${lib.dir}" - stacklibs="${lib.dir}" - thirdpartylibs="${lib.dir}"/> - - <macro-deploy-spi - spilibs="${lib.dir}" - thirdpartylibs="${lib.dir}" - jbosshome="${jboss40.home}"/> - </target> - - <target name="deploy-jboss40-no-ejb3" depends="deploy-jboss40-ejb3" unless="jboss40.ejb3.available"> - <macro-setup-native40-no-ejb3/> - <echo> - *********************************** - * JBossWS EJB3 support disabled * - * All EJB3 tests will fail. * - *********************************** - </echo> - </target> - -  - <target name="undeploy-jboss40" depends="prepare" description="Remove jbossws/native from jboss40"> - <macro-undeploy-native40/> - <macro-undeploy-spi jbosshome="${jboss40.home}"/> - </target> - -</project> Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1702/JBWS1702TestCase.java 2007-08-04 15:55:26 UTC (rev 4207) @@ -21,18 +21,24 @@ */ package org.jboss.test.ws.jaxws.jbws1702; +import java.net.URL; + +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import junit.framework.Test; + import org.jboss.test.ws.jaxws.jbws1702.types.ClassB; import org.jboss.test.ws.jaxws.jbws1702.types.ClassC; import org.jboss.test.ws.jaxws.jbws1702.types.ResponseWrapperB; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; -import java.net.URL; - /** + * [JBWS-1702] JAXWS type inheritance + * + * http://jira.jboss.org/jira/browse/JBWS-1702 + * * @author Heiko.Braun(a)jboss.com * @version $Revision$ */ @@ -45,30 +51,37 @@ public void testInheritanceBare() throws Exception { - System.out.println("FIXME: [JBWS-1702]: Type inheritance on Doclit/Bare"); - /*Service service = Service.create( - new URL("http://"+getServerHost()+":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"), - new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_BareService") - ); + if (true) + { + System.out.println("FIXME: [JBWS-1702]: Type inheritance on Doclit/Bare"); + return; + } + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Bare?wsdl"); + QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_BareService"); + Service service = Service.create(wsdlURL, serviceName); + SampleWSBareSEI port = service.getPort(SampleWSBareSEI.class); ResponseWrapperB wrapper = port.getClassCAsClassB(); ClassB b = wrapper.getData(); assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); - */ } public void testInheritanceWrapped() throws Exception { - Service service = Service.create( - new URL("http://"+getServerHost()+":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"), - new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_WrappedService") - ); + if (true) + { + System.out.println("FIXME: [JBWS-1702]: Type inheritance on Doclit/Bare"); + return; + } + URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jbws1702/SampleWSWithDocument_Wrapped?wsdl"); + QName serviceName = new QName("http://jbws1702.jaxws.ws.test.jboss.org/", "SampleWSWithDocument_WrappedService"); + Service service = Service.create(wsdlURL, serviceName); + SampleWSWrappedSEI port = service.getPort(SampleWSWrappedSEI.class); - ClassB b = port.getClassCAsClassB(); + ClassB b = port.getClassCAsClassB(); assertTrue("Should be an instance of ClassC, but was " + b, (b instanceof ClassC)); } - } Modified: stack/native/trunk/tools/ant/README_JDK6.txt =================================================================== --- stack/native/trunk/tools/ant/README_JDK6.txt 2007-08-04 15:53:52 UTC (rev 4206) +++ stack/native/trunk/tools/ant/README_JDK6.txt 2007-08-04 15:55:26 UTC (rev 4207) @@ -1,6 +1,5 @@ The endorsed libs in this directory are used by the build scripts -when running JDK 1.6. In order enable the endorsed mechanism uncomment the -USE_JDK6 property within the build scripts, or change it in build/build.conf +when running JDK 1.6. See http://jira.jboss.com/jira/browse/JBWS-1439

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4206 - framework/trunk/src/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 11:53:52 -0400 (Sat, 04 Aug 2007) New Revision: 4206 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: Move jaxws-tools.jar to stack extras Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-04 13:52:56 UTC (rev 4205) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-04 15:53:52 UTC (rev 4206) @@ -101,6 +101,7 @@ <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxws-tools.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.client}/jboss-common-core.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -109,11 +110,6 @@ <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/mail.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> - -  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> <pathelement location="${jboss.server.lib}/servlet-api.jar"/> @@ -151,14 +147,7 @@ <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"/> - -  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/wstx.jar"/> <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> - - </path> </target> @@ -182,11 +171,6 @@ <pathelement location="${jboss.client}/stax-api.jar"/> <pathelement location="${jboss.client}/wsdl4j.jar"/> <pathelement location="${jboss.server.lib}/servlet-api.jar"/> - -  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - </path>  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/wstx.jar"/> <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> </path> </target> @@ -247,10 +226,6 @@ <pathelement location="${jboss.client}/stax-api.jar"/> <pathelement location="${jboss.client}/jbosssx-client.jar"/> <pathelement location="${jboss.server.lib}/javax.servlet.jar"/> - -  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> </path>  - <pathelement location="${jboss.client}/jbossws-spi.jar"/> - <pathelement location="${jboss.client}/jaxws-tools.jar"/> - <pathelement location="${jboss.client}/wstx.jar"/> <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> </path> </target>

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4205 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 09:52:56 -0400 (Sat, 04 Aug 2007) New Revision: 4205 Modified: stack/metro/trunk/build.bat stack/metro/trunk/build.sh Log: Always use ant/endorsed Modified: stack/metro/trunk/build.bat =================================================================== --- stack/metro/trunk/build.bat 2007-08-04 13:52:52 UTC (rev 4204) +++ stack/metro/trunk/build.bat 2007-08-04 13:52:56 UTC (rev 4205) @@ -7,8 +7,6 @@ REM Users should be sure to execute this file rather than 'ant' to ensure REM the correct version is being used with the correct configuration. REM -REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 -REM REM ====================================================================== REM REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ @@ -29,12 +27,6 @@ set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat -REM ****************************************************** -REM JDK 6 Settings -REM Uncomment when using JDK 6 -REM ****************************************************** -REM set USE_JDK6=true - REM REM - "for" loops have been unrolled for compatibility REM with some WIN32 systems. Modified: stack/metro/trunk/build.sh =================================================================== --- stack/metro/trunk/build.sh 2007-08-04 13:52:52 UTC (rev 4204) +++ stack/metro/trunk/build.sh 2007-08-04 13:52:56 UTC (rev 4205) @@ -20,9 +20,6 @@ # Ignore user's ANT_HOME if it is set ANT_HOME="" -# Uncomment when using JDK 6 -#USE_JDK6=true - # the default search path for ant ANT_SEARCH_PATH="tools/ant" @@ -148,12 +145,8 @@ # Set the max memory to 256m ANT_OPTS=-Xmx256m - if [ "x$USE_JDK6" = "xtrue" ]; then - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - echo "--------------------------------------" - echo "Endorsed Directory: $ANT_HOME/endorsed" - echo "--------------------------------------" - fi + # Endorse JAXB, JAXWS API + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" # setup some build properties ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4204 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 09:52:52 -0400 (Sat, 04 Aug 2007) New Revision: 4204 Modified: stack/cxf/trunk/build.bat stack/cxf/trunk/build.sh Log: Always use ant/endorsed Modified: stack/cxf/trunk/build.bat =================================================================== --- stack/cxf/trunk/build.bat 2007-08-04 13:52:48 UTC (rev 4203) +++ stack/cxf/trunk/build.bat 2007-08-04 13:52:52 UTC (rev 4204) @@ -7,8 +7,6 @@ REM Users should be sure to execute this file rather than 'ant' to ensure REM the correct version is being used with the correct configuration. REM -REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 -REM REM ====================================================================== REM REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ @@ -29,12 +27,6 @@ set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat -REM ****************************************************** -REM JDK 6 Settings -REM Uncomment when using JDK 6 -REM ****************************************************** -REM set USE_JDK6=true - REM REM - "for" loops have been unrolled for compatibility REM with some WIN32 systems. Modified: stack/cxf/trunk/build.sh =================================================================== --- stack/cxf/trunk/build.sh 2007-08-04 13:52:48 UTC (rev 4203) +++ stack/cxf/trunk/build.sh 2007-08-04 13:52:52 UTC (rev 4204) @@ -20,9 +20,6 @@ # Ignore user's ANT_HOME if it is set ANT_HOME="" -# Uncomment when using JDK 6 -#USE_JDK6=true - # the default search path for ant ANT_SEARCH_PATH="tools/ant" @@ -148,12 +145,8 @@ # Set the max memory to 256m ANT_OPTS=-Xmx256m - if [ "x$USE_JDK6" = "xtrue" ]; then - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - echo "--------------------------------------" - echo "Endorsed Directory: $ANT_HOME/endorsed" - echo "--------------------------------------" - fi + # Endorse JAXB, JAXWS API + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" # setup some build properties ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4203 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 09:52:48 -0400 (Sat, 04 Aug 2007) New Revision: 4203 Modified: stack/native/trunk/build.bat stack/native/trunk/build.sh Log: Always use ant/endorsed Modified: stack/native/trunk/build.bat =================================================================== --- stack/native/trunk/build.bat 2007-08-04 13:38:40 UTC (rev 4202) +++ stack/native/trunk/build.bat 2007-08-04 13:52:48 UTC (rev 4203) @@ -7,8 +7,6 @@ REM Users should be sure to execute this file rather than 'ant' to ensure REM the correct version is being used with the correct configuration. REM -REM NOTE: Uncomment the USE_JDK6 property when using JDK 1.6 -REM REM ====================================================================== REM REM $Id: build.bat 61858 2007-03-29 17:19:26Z dimitris(a)jboss.org $ @@ -29,12 +27,6 @@ set ANT_OPTS=-Xmx256m -Dbuild.script=build.bat -REM ****************************************************** -REM JDK 6 Settings -REM Uncomment when using JDK 6 -REM ****************************************************** -REM set USE_JDK6=true - REM REM - "for" loops have been unrolled for compatibility REM with some WIN32 systems. Modified: stack/native/trunk/build.sh =================================================================== --- stack/native/trunk/build.sh 2007-08-04 13:38:40 UTC (rev 4202) +++ stack/native/trunk/build.sh 2007-08-04 13:52:48 UTC (rev 4203) @@ -20,9 +20,6 @@ # Ignore user's ANT_HOME if it is set ANT_HOME="" -# Uncomment when using JDK 6 -#USE_JDK6=true - # the default search path for ant ANT_SEARCH_PATH="tools/ant" @@ -148,12 +145,8 @@ # Set the max memory to 256m ANT_OPTS=-Xmx256m - #if [ "x$USE_JDK6" = "xtrue" ]; then - ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" - echo "--------------------------------------" - echo "Endorsed Directory: $ANT_HOME/endorsed" - echo "--------------------------------------" - #fi + # Endorse JAXB, JAXWS API + ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" # setup some build properties ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4202 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 09:38:40 -0400 (Sat, 04 Aug 2007) New Revision: 4202 Modified: stack/native/trunk/build.sh Log: Try to always use ant/endorsed Modified: stack/native/trunk/build.sh =================================================================== --- stack/native/trunk/build.sh 2007-08-04 12:07:59 UTC (rev 4201) +++ stack/native/trunk/build.sh 2007-08-04 13:38:40 UTC (rev 4202) @@ -148,12 +148,12 @@ # Set the max memory to 256m ANT_OPTS=-Xmx256m - if [ "x$USE_JDK6" = "xtrue" ]; then + #if [ "x$USE_JDK6" = "xtrue" ]; then ANT_OPTS="$ANT_OPTS -Djava.endorsed.dirs=$ANT_HOME/endorsed" echo "--------------------------------------" echo "Endorsed Directory: $ANT_HOME/endorsed" echo "--------------------------------------" - fi + #fi # setup some build properties ANT_OPTS="$ANT_OPTS -Dbuild.script=$0"

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4201 - framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2 and 14 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 08:07:59 -0400 (Sat, 04 Aug 2007) New Revision: 4201 Added: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java Removed: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml stack/cxf/trunk/ant.properties.example stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java stack/cxf/trunk/version.properties stack/metro/trunk/ant.properties.example stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java stack/metro/trunk/version.properties stack/native/trunk/ant.properties.example stack/native/trunk/build.xml stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java Log: Use AbstractServerConfig Copied: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java (from rev 4196, common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -0,0 +1,226 @@ +/* + * 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.wsf.common.management; + +//$Id$ + +import java.io.File; +import java.net.InetAddress; +import java.net.UnknownHostException; +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.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.management.ServerConfig; + +/** + * Basic implementation of a ServerConfig + * + * @author Thomas.Diesler(a)jboss.org + * @author darran.lofthouse(a)jboss.com + * @since 08-May-2006 + */ +public abstract class AbstractServerConfig implements AbstractServerConfigMBean, ServerConfig +{ + private static final Logger log = Logger.getLogger(AbstractServerConfig.class); + + // The MBeanServer + private MBeanServer mbeanServer; + // The webservice host name that will be used when updating the wsdl + private String webServiceHost = UNDEFINED_HOSTNAME; + // The webservice port that will be used when updating the wsdl + private int webServicePort; + // The webservice port that will be used when updating the wsdl + private int webServiceSecurePort; + // Whether we should always modify the soap address to the deployed endpoing location + private boolean modifySOAPAddress; + + public MBeanServer getMbeanServer() + { + return mbeanServer; + } + + public void setMbeanServer(MBeanServer mbeanServer) + { + this.mbeanServer = mbeanServer; + } + + public String getWebServiceHost() + { + return webServiceHost; + } + + public void setWebServiceHost(String host) throws UnknownHostException + { + if (host == null || host.trim().length() == 0) + { + log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); + host = UNDEFINED_HOSTNAME; + } + if ("0.0.0.0".equals(host)) + { + InetAddress localHost = InetAddress.getLocalHost(); + log.debug("Using local host: " + localHost.getHostName()); + host = localHost.getHostName(); + } + this.webServiceHost = host; + } + + public void setWebServicePort(int port) + { + this.webServicePort = port; + } + + public void setWebServiceSecurePort(int port) + { + this.webServiceSecurePort = port; + } + + public boolean isModifySOAPAddress() + { + return modifySOAPAddress; + } + + public void setModifySOAPAddress(boolean modify) + { + this.modifySOAPAddress = modify; + } + + public File getServerTempDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } + + public File getServerDataDir() + { + try + { + ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); + File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir"); + return tmpdir; + } + catch (JMException e) + { + return null; + } + } + + public int getWebServicePort() + { + if (webServicePort <= 0) + webServicePort = getConnectorPort("HTTP/1.1", false); + + int localPort = webServicePort; + if (localPort <= 0) + { + // Do not initialize webServicePort with the default, the connector port may become available later + log.warn("Unable to calculate 'WebServicePort', using default '8080'"); + localPort = 8080; + } + + return localPort; + } + + public int getWebServiceSecurePort() + { + if (webServiceSecurePort <= 0) + webServiceSecurePort = getConnectorPort("HTTP/1.1", true); + + int localPort = webServiceSecurePort; + if (localPort <= 0) + { + // Do not initialize webServiceSecurePort with the default, the connector port may become available later + log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); + localPort = 8443; + } + + return localPort; + } + + public void create() throws Exception + { + getMbeanServer().registerMBean(this, AbstractServerConfigMBean.OBJECT_NAME); + } + + public void destroy() throws Exception + { + getMbeanServer().unregisterMBean(AbstractServerConfigMBean.OBJECT_NAME); + } + + private int getConnectorPort(final String protocol, final boolean secure) + { + int port = -1; + + try + { + ObjectName connectors = new ObjectName("jboss.web:type=Connector,*"); + + Set connectorNames = getMbeanServer().queryNames(connectors, null); + for (Object current : connectorNames) + { + ObjectName currentName = (ObjectName)current; + + try + { + int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port"); + boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure"); + String connectorProtocol = (String)getMbeanServer().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; + } + } +} Copied: common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java (from rev 4196, common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java) =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java (rev 0) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/AbstractServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -0,0 +1,37 @@ +/* + * 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.wsf.common.management; + +import javax.management.ObjectName; + +import org.jboss.wsf.common.ObjectNameFactory; +import org.jboss.wsf.spi.management.ServerConfig; + +public interface AbstractServerConfigMBean extends ServerConfig +{ + /** The object name in the MBean server */ + ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); + + String getImplementationTitle(); + + String getImplementationVersion(); +} Deleted: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -1,226 +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.wsf.common.management; - -//$Id$ - -import java.io.File; -import java.net.InetAddress; -import java.net.UnknownHostException; -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.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.management.ServerConfig; - -/** - * Basic implementation of a ServerConfig - * - * @author Thomas.Diesler(a)jboss.org - * @author darran.lofthouse(a)jboss.com - * @since 08-May-2006 - */ -public class DefaultServerConfig implements DefaultServerConfigMBean, ServerConfig -{ - private static final Logger log = Logger.getLogger(DefaultServerConfig.class); - - // The MBeanServer - private MBeanServer mbeanServer; - // The webservice host name that will be used when updating the wsdl - private String webServiceHost = UNDEFINED_HOSTNAME; - // The webservice port that will be used when updating the wsdl - private int webServicePort; - // The webservice port that will be used when updating the wsdl - private int webServiceSecurePort; - // Whether we should always modify the soap address to the deployed endpoing location - private boolean modifySOAPAddress; - - public MBeanServer getMbeanServer() - { - return mbeanServer; - } - - public void setMbeanServer(MBeanServer mbeanServer) - { - this.mbeanServer = mbeanServer; - } - - public String getWebServiceHost() - { - return webServiceHost; - } - - public void setWebServiceHost(String host) throws UnknownHostException - { - if (host == null || host.trim().length() == 0) - { - log.debug("Using undefined host: " + UNDEFINED_HOSTNAME); - host = UNDEFINED_HOSTNAME; - } - if ("0.0.0.0".equals(host)) - { - InetAddress localHost = InetAddress.getLocalHost(); - log.debug("Using local host: " + localHost.getHostName()); - host = localHost.getHostName(); - } - this.webServiceHost = host; - } - - public void setWebServicePort(int port) - { - this.webServicePort = port; - } - - public void setWebServiceSecurePort(int port) - { - this.webServiceSecurePort = port; - } - - public boolean isModifySOAPAddress() - { - return modifySOAPAddress; - } - - public void setModifySOAPAddress(boolean modify) - { - this.modifySOAPAddress = modify; - } - - public File getServerTempDir() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir"); - return tmpdir; - } - catch (JMException e) - { - return null; - } - } - - public File getServerDataDir() - { - try - { - ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig"); - File tmpdir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir"); - return tmpdir; - } - catch (JMException e) - { - return null; - } - } - - public int getWebServicePort() - { - if (webServicePort <= 0) - webServicePort = getConnectorPort("HTTP/1.1", false); - - int localPort = webServicePort; - if (localPort <= 0) - { - // Do not initialize webServicePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServicePort', using default '8080'"); - localPort = 8080; - } - - return localPort; - } - - public int getWebServiceSecurePort() - { - if (webServiceSecurePort <= 0) - webServiceSecurePort = getConnectorPort("HTTP/1.1", true); - - int localPort = webServiceSecurePort; - if (localPort <= 0) - { - // Do not initialize webServiceSecurePort with the default, the connector port may become available later - log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'"); - localPort = 8443; - } - - return localPort; - } - - public void create() throws Exception - { - getMbeanServer().registerMBean(this, DefaultServerConfigMBean.OBJECT_NAME); - } - - public void destroy() throws Exception - { - getMbeanServer().unregisterMBean(DefaultServerConfigMBean.OBJECT_NAME); - } - - private int getConnectorPort(final String protocol, final boolean secure) - { - int port = -1; - - try - { - ObjectName connectors = new ObjectName("jboss.web:type=Connector,*"); - - Set connectorNames = getMbeanServer().queryNames(connectors, null); - for (Object current : connectorNames) - { - ObjectName currentName = (ObjectName)current; - - try - { - int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port"); - boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure"); - String connectorProtocol = (String)getMbeanServer().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; - } - } -} Deleted: common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200) +++ common/trunk/src/main/java/org/jboss/wsf/common/management/DefaultServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -1,33 +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.wsf.common.management; - -import javax.management.ObjectName; - -import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.spi.management.ServerConfig; - -public interface DefaultServerConfigMBean extends ServerConfig -{ - /** The object name in the MBean server */ - ObjectName OBJECT_NAME = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); -} Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKNATIVE=$WORKSPACE/stack-metro +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,7 +27,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss42 @@ -39,7 +41,7 @@ # # Build distro # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKNATIVE=$WORKSPACE/stack-metro +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,14 +27,14 @@ # # Build distro # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss50 Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKNATIVE=$WORKSPACE/stack-cxf +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,7 +27,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss42 @@ -39,7 +41,7 @@ # # Build distro # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKNATIVE=$WORKSPACE/stack-cxf +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,14 +27,14 @@ # # Build distro # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss50 Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework +STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -23,7 +25,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss42 Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework +STACKNATIVE=$WORKSPACE/stack-native STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -23,7 +25,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss50 Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,6 +10,8 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -23,7 +25,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss42 Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -10,6 +10,8 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ @@ -23,7 +25,7 @@ # # Undeploy stack-native # -cd $STACKNATIVE +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT undeploy-jboss50 Modified: stack/cxf/trunk/ant.properties.example =================================================================== --- stack/cxf/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/cxf/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201) @@ -3,6 +3,9 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.common.management.DefaultServerConfig; +import org.jboss.wsf.common.management.AbstractServerConfig; /** * Basic implementation of a ServerConfig @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public class CXFServerConfig extends DefaultServerConfig implements CXFServerConfigMBean +public class CXFServerConfig extends AbstractServerConfig implements CXFServerConfigMBean { private static final Logger log = Logger.getLogger(CXFServerConfig.class); Modified: stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java =================================================================== --- stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/cxf/trunk/src/main/java/org/jboss/wsf/stack/xfire/CXFServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.common.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.AbstractServerConfigMBean; /** * Basic implementation of a ServerConfig @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public interface CXFServerConfigMBean extends DefaultServerConfigMBean +public interface CXFServerConfigMBean extends AbstractServerConfigMBean { String getImplementationTitle(); Modified: stack/cxf/trunk/version.properties =================================================================== --- stack/cxf/trunk/version.properties 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/cxf/trunk/version.properties 2007-08-04 12:07:59 UTC (rev 4201) @@ -1,8 +1,18 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -sunri.implementation.title=JBoss Web Services - Apache CXF +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 +version.id=2.1.0.DEV +repository.id=2.1.0.DEV + +implementation.title=JBoss Web Services - Apache CXF +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + # Thirdparty library versions jbossws-common=2.0.1.CR1 jbossws-framework=2.0.1.CR1 Modified: stack/metro/trunk/ant.properties.example =================================================================== --- stack/metro/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/metro/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201) @@ -3,6 +3,9 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.common.management.DefaultServerConfig; +import org.jboss.wsf.common.management.AbstractServerConfig; /** * Basic implementation of a ServerConfig @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public class MetroServerConfig extends DefaultServerConfig implements MetroServerConfigMBean +public class MetroServerConfig extends AbstractServerConfig implements MetroServerConfigMBean { private static final Logger log = Logger.getLogger(MetroServerConfig.class); Modified: stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java =================================================================== --- stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/metro/trunk/src/main/java/org/jboss/wsf/stack/sunri/MetroServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.common.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.AbstractServerConfigMBean; /** * Basic implementation of a ServerConfig @@ -31,9 +31,6 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public interface MetroServerConfigMBean extends DefaultServerConfigMBean +public interface MetroServerConfigMBean extends AbstractServerConfigMBean { - String getImplementationTitle(); - - String getImplementationVersion(); } Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/metro/trunk/version.properties 2007-08-04 12:07:59 UTC (rev 4201) @@ -1,8 +1,18 @@ # $Id: version.properties 2928 2007-04-26 10:53:56Z thomas.diesler(a)jboss.com $ -sunri.implementation.title=JBoss Web Services - JBossWS/SunRI +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 +version.id=2.1.0.DEV +repository.id=2.1.0.DEV + +implementation.title=JBoss Web Services - Sun Metro +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + # Thirdparty library versions jbossws-common=2.0.1.CR1 jbossws-framework=2.0.1.CR1 Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/native/trunk/ant.properties.example 2007-08-04 12:07:59 UTC (rev 4201) @@ -3,6 +3,9 @@ # # $Id$ +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 #jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/native/trunk/build.xml 2007-08-04 12:07:59 UTC (rev 4201) @@ -373,7 +373,7 @@ <target name="main" description="Executes the default target (most)." depends="most"/> - <target name="most" description="Builds almost everything." depends="jars"/> + <target name="most" description="Builds almost everything." depends="jars,tests-main"/> <target name="all" description="Create a distribution zip file" depends="most"> </target> Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfig.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -24,7 +24,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ import org.jboss.logging.Logger; -import org.jboss.wsf.common.management.DefaultServerConfig; +import org.jboss.wsf.common.management.AbstractServerConfig; /** * Basic implementation of a ServerConfig @@ -32,7 +32,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public class NativeServerConfig extends DefaultServerConfig implements NativeServerConfigMBean +public class NativeServerConfig extends AbstractServerConfig implements NativeServerConfigMBean { private static final Logger log = Logger.getLogger(NativeServerConfig.class); Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/NativeServerConfigMBean.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -23,7 +23,7 @@ //$Id: DefaultServerConfig.java 4023 2007-07-28 07:14:06Z thomas.diesler(a)jboss.com $ -import org.jboss.wsf.common.management.DefaultServerConfigMBean; +import org.jboss.wsf.common.management.AbstractServerConfigMBean; /** * Basic implementation of a ServerConfig @@ -31,7 +31,7 @@ * @author Thomas.Diesler(a)jboss.org * @since 08-May-2006 */ -public interface NativeServerConfigMBean extends DefaultServerConfigMBean +public interface NativeServerConfigMBean extends AbstractServerConfigMBean { String getImplementationTitle(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-04 11:47:17 UTC (rev 4200) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/addressrewrite/AddressRewriteTestCase.java 2007-08-04 12:07:59 UTC (rev 4201) @@ -31,7 +31,6 @@ import javax.xml.rpc.ServiceFactory; import org.jboss.wsf.common.ObjectNameFactory; -import org.jboss.wsf.common.management.DefaultServerConfigMBean; import org.jboss.wsf.test.JBossWSTest; /**

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4200 - framework/trunk.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 07:47:17 -0400 (Sat, 04 Aug 2007) New Revision: 4200 Modified: framework/trunk/ant.properties.example framework/trunk/version.properties Log: Update to hudson-1.126 Modified: framework/trunk/ant.properties.example =================================================================== --- framework/trunk/ant.properties.example 2007-08-04 11:45:59 UTC (rev 4199) +++ framework/trunk/ant.properties.example 2007-08-04 11:47:17 UTC (rev 4200) @@ -3,6 +3,9 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ +# JDK settings +#java.home.jdk16=/usr/java/jdk1.6 + # The JBoss settings jboss.bind.address=localhost Modified: framework/trunk/version.properties =================================================================== --- framework/trunk/version.properties 2007-08-04 11:45:59 UTC (rev 4199) +++ framework/trunk/version.properties 2007-08-04 11:47:17 UTC (rev 4200) @@ -28,4 +28,4 @@ # Hudson setup apache-tomcat=5.5.20 -sun-hudson=1.119 +sun-hudson=1.126

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4199 - in framework/trunk/hudson/hudson-home/jobs: AS-Tests-AS-4.2 and 19 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 07:45:59 -0400 (Sat, 04 Aug 2007) New Revision: 4199 Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml Log: Fix undeploy of previous stack Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/(a)hudson.jboss40.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40" @@ -23,7 +25,7 @@ # # build/deploy jbossws-native # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 clean jars ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40 @@ -88,6 +90,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -21,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ant $ENVIRONMENT clean deploy-jboss42 @@ -87,6 +103,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/AS-Tests-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -21,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ant $ENVIRONMENT clean deploy-jboss50 @@ -87,6 +103,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" @@ -23,7 +25,7 @@ # # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss40 @@ -74,6 +76,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -21,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 @@ -74,6 +90,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-4.2-JDK6/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,20 +10,21 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" # -# Verify JDK 6 availablility +# Verify JDK1.6 availablility # -if [ "@jdk6.home@" = "jdk6.home" ]; then - echo "Please point jdk6.home (ant.properties) to your JAVA 1.6 installation" +if [ "java.home.jdk16" = "@java.home.jdk16@" ]; then + echo "Please point java.home.jdk16 (ant.properties) to your JDK1.6 installation" exit 1 else - JAVA_HOME="@jdk6.home@" - cp $STACKDIR/build/build.conf.example $STACKDIR/build/build.conf + JAVA_HOME="@java.home.jdk16@" fi # @@ -32,9 +33,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 @@ -85,6 +100,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Core-Tests-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -21,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # deploy to jboss # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 @@ -74,6 +90,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -26,7 +28,7 @@ # # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -83,6 +85,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -26,11 +28,25 @@ # # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Deploy distro # cd output/jbossws-native-(a)version.id@ @@ -83,6 +99,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-Native-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -26,11 +28,25 @@ # # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # Deploy distro # cd output/jbossws-native-(a)version.id@ @@ -83,6 +99,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +STACKNATIVE=$WORKSPACE/stack-metro JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -23,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -79,9 +93,17 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> <local>stack-metro</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-SunRI-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +STACKNATIVE=$WORKSPACE/stack-metro JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,11 +25,25 @@ # # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # Deploy distro # cd output/jbossws-sunri-(a)version.id@ @@ -79,9 +93,17 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> <local>stack-metro</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +STACKNATIVE=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -23,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist @@ -79,6 +93,14 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> <local>stack-cxf</local> </hudson.scm.SubversionSCM-ModuleLocation> Modified: framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Distro-XFire-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +STACKNATIVE=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS50_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ JBOSS42_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ @@ -25,11 +25,25 @@ # # Build distro # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean build-bin-dist # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # Deploy distro # cd output/jbossws-xfire-(a)version.id@ @@ -79,6 +93,14 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> <local>stack-cxf</local> </hudson.scm.SubversionSCM-ModuleLocation> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.0/workspace/JBossAS-4.0/build/output/@hudson.jboss40.build(a)-ejb3 ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss40 -Djboss40.home=$JBOSS_INSTANCE" @@ -23,7 +25,7 @@ # # Build jbws-jboss40 # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss40 @@ -74,6 +76,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -21,9 +23,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Build jbws-jboss42 # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 @@ -74,6 +90,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-Native-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,9 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-native +STACKNATIVE=$WORKSPACE/stack-native +STACKMETRO=$WORKSPACE/stack-metro +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -19,11 +21,25 @@ # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop + +# +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 # # Build deploy-jboss50 # -cd $STACKDIR +cd $STACKNATIVE cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 @@ -74,6 +90,14 @@ <remote>@hudson.native.url@</remote> <local>stack-native</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +STACKMETRO=$WORKSPACE/stack-metro JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -21,9 +21,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Build sunri # -cd $STACKDIR +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 @@ -71,9 +85,17 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> <local>stack-metro</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-SunRI-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-metro +STACKMETRO=$WORKSPACE/stack-metro JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -21,9 +21,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-cxf +# +cd $STACKCXF +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # Build sunri-jboss50 # -cd $STACKDIR +cd $STACKMETRO cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 @@ -71,9 +85,17 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.metro.url@</remote> <local>stack-metro</local> </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> </locations> <useUpdate>true</useUpdate> <browser class="hudson.scm.browsers.FishEyeSVN"> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-4.2/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-4.2/workspace/JBossAS-4.2/build/output/(a)hudson.jboss42.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss42 -Djboss42.home=$JBOSS_INSTANCE" @@ -21,9 +21,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss42 + +# # Build xfire # -cd $STACKDIR +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss42 @@ -71,6 +85,14 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> <local>stack-cxf</local> </hudson.scm.SubversionSCM-ModuleLocation> Modified: framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 07:57:59 UTC (rev 4198) +++ framework/trunk/hudson/hudson-home/jobs/Integration-XFire-AS-5.0/config.xml 2007-08-04 11:45:59 UTC (rev 4199) @@ -10,7 +10,7 @@ WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework -STACKDIR=$WORKSPACE/stack-cxf +STACKCXF=$WORKSPACE/stack-cxf JBOSS_BINDADDR=(a)jboss.bind.address@ JBOSS_INSTANCE=@hudson.home@/jobs/AS-5.0/workspace/JBossAS-5.0/build/output/(a)hudson.jboss50.build@ ENVIRONMENT="-Dforce.thirdparty.get=true -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss50 -Djboss50.home=$JBOSS_INSTANCE" @@ -21,9 +21,23 @@ $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop # +# Undeploy stack-native +# +cd $STACKNATIVE +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# +# Undeploy stack-metro +# +cd $STACKMETRO +cp ant.properties.example ant.properties +./build.sh $ENVIRONMENT undeploy-jboss50 + +# # Build xfire # -cd $STACKDIR +cd $STACKCXF cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT clean deploy-jboss50 @@ -71,6 +85,14 @@ <local>framework</local> </hudson.scm.SubversionSCM-ModuleLocation> <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.metro.url@</remote> + <local>stack-metro</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> <remote>@hudson.cxf.url@</remote> <local>stack-cxf</local> </hudson.scm.SubversionSCM-ModuleLocation>

17 years, 4 months

1
0
0 / 0

JBossWS SVN: r4198 - in stack/native/trunk: src/main/etc and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2007-08-04 03:57:59 -0400 (Sat, 04 Aug 2007) New Revision: 4198 Modified: stack/native/trunk/ant.properties.example stack/native/trunk/src/main/etc/default.mf stack/native/trunk/version.properties Log: Add common & framework jar to manifest classpath Modified: stack/native/trunk/ant.properties.example =================================================================== --- stack/native/trunk/ant.properties.example 2007-08-03 19:55:20 UTC (rev 4197) +++ stack/native/trunk/ant.properties.example 2007-08-04 07:57:59 UTC (rev 4198) @@ -5,8 +5,8 @@ # Optional JBoss Home #jboss50.home=/home/tdiesler/svn/jbossas/trunk/build/output/jboss-5.0.0.Beta3 -#jboss42.home=/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.0.GA -#jboss40.home=/home/tdiesler/svn/jbossas/branches/Branch_4_0/build/output/jboss-4.0.5.SP1-ejb3 +#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA +#jboss40.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_0_5_GA/build/output/jboss-4.0.5.GA-ejb3 # The JBoss server under test. This can be [jboss50|jboss42|jboss40|tomcat] jbossws.integration.target=jboss50 Modified: stack/native/trunk/src/main/etc/default.mf =================================================================== --- stack/native/trunk/src/main/etc/default.mf 2007-08-03 19:55:20 UTC (rev 4197) +++ stack/native/trunk/src/main/etc/default.mf 2007-08-04 07:57:59 UTC (rev 4198) @@ -8,6 +8,6 @@ Implementation-Version: @implementation.version@ (build=(a)build.id@) Implementation-Vendor: @implementation.vendor@ Implementation-Vendor-Id: @implementation.vendor.id@ -Class-Path: jbossws-spi.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar +Class-Path: jbossws-spi.jar jbossws-common.jar jbossws-framework.jar jboss-jaxrpc.jar jboss-jaxws.jar jboss-saaj.jar activation.jar commons-logging.jar concurrent.jar javassist.jar jaxb-api.jar jaxb-impl.jar mail.jar jboss-remoting.jar jboss-xml-binding.jar policy.jar stax-api.jar wsdl4j.jar Modified: stack/native/trunk/version.properties =================================================================== --- stack/native/trunk/version.properties 2007-08-03 19:55:20 UTC (rev 4197) +++ stack/native/trunk/version.properties 2007-08-04 07:57:59 UTC (rev 4198) @@ -1,6 +1,18 @@ # $Id$ +specification.title=JBossWS +specification.vendor=JBoss (http://www.jboss.org) +specification.version=jbossws-2.0 + +version.id=2.1.0.DEV +repository.id=2.1.0.DEV + +implementation.title=JBoss Web Services - Native +implementation.url=http://www.jboss.org/products/jbossws +implementation.vendor=JBoss Inc. +implementation.vendor.id=http://www.jboss.org + # Thirdparty library versions that are referenced in component-info.xml apache-xmlsec=1.3.0 ibm-wsdl4j=1.6.2

17 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits August 2007