February 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5834 - stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-28 03:47:52 -0500 (Thu, 28 Feb 2008) New Revision: 5834 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java Log: [JBWS-1844] Implement Provider.createW3CEndpointReference Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-28 08:31:23 UTC (rev 5833) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxws/spi/ServiceDelegateImpl.java 2008-02-28 08:47:52 UTC (rev 5834) @@ -482,7 +482,9 @@ W3CEndpointReference w3c = (W3CEndpointReference)epr; portName = w3c.getEndpointName(); } + Dispatch<T> dispatch = createDispatch(portName, type, mode); + initAddressingProperties(dispatch, epr); return dispatch; } @@ -510,6 +512,7 @@ } Dispatch<Object> dispatch = createDispatch(portName, context, mode); + initAddressingProperties(dispatch, epr); return dispatch; } @@ -530,7 +533,7 @@ log.warn("WebServiceFeature not implemented"); T port = getPort(sei); - initAddressingProperties(port, epr); + initAddressingProperties((BindingProvider)port, epr); return port; } @@ -545,9 +548,9 @@ } // Workaround for [JBWS-2015] Modify addressing handlers to work with the JAXWS-2.1 API - private <T> void initAddressingProperties(T port, EndpointReference epr) + private void initAddressingProperties(BindingProvider bindingProvider, EndpointReference epr) { - Map<String, Object> reqContext = ((BindingProvider)port).getRequestContext(); + Map<String, Object> reqContext = bindingProvider.getRequestContext(); AddressingBuilder builder = AddressingBuilder.getAddressingBuilder(); AddressingProperties addrProps = builder.newAddressingProperties(); reqContext.put(JAXWSAConstants.CLIENT_ADDRESSING_PROPERTIES_OUTBOUND, addrProps);

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5833 - stack/native/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-28 03:31:23 -0500 (Thu, 28 Feb 2008) New Revision: 5833 Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix deploy-endorsed in bin-dist Modified: stack/native/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-28 08:06:16 UTC (rev 5832) +++ stack/native/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-28 08:31:23 UTC (rev 5833) @@ -22,7 +22,7 @@ <macro-deploy-native421 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="undeploy-jboss421" depends="prepare" description="Remove jbossws/native from jboss421"> @@ -34,7 +34,7 @@ <macro-deploy-native422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/native from jboss422"> @@ -46,7 +46,7 @@ <macro-deploy-native423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/native from jboss423"> @@ -58,7 +58,7 @@ <macro-deploy-native500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/native from jboss500"> @@ -74,7 +74,7 @@ <macro-deploy-native501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> + <macro-deploy-endorsed stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> </target> <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws from jboss501">

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5832 - in stack: metro/trunk/ant-import and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-28 03:06:16 -0500 (Thu, 28 Feb 2008) New Revision: 5832 Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/metro/trunk/ant-import/macros-deploy-metro.xml Log: Deploy spi, common, framework with metro and cxf Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-28 07:55:53 UTC (rev 5831) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-28 08:06:16 UTC (rev 5832) @@ -31,6 +31,9 @@ </patternset> <patternset id="server.lib.patternset"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> <include name="jaxws-api-${cxf.jaxws.api}.jar"/> <include name="saaj-api-${cxf.saaj}.jar"/> </patternset> Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-28 07:55:53 UTC (rev 5831) +++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-28 08:06:16 UTC (rev 5832) @@ -38,6 +38,9 @@ </patternset> <patternset id="server.lib.patternset"> + <include name="jbossws-common.jar"/> + <include name="jbossws-framework.jar"/> + <include name="jbossws-spi.jar"/> <include name="jaxws-api.jar"/> <include name="jsr181-api.jar"/> <include name="saaj-api.jar"/>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5831 - stack/native/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-28 02:55:53 -0500 (Thu, 28 Feb 2008) New Revision: 5831 Modified: stack/native/trunk/ant-import/build-deploy.xml Log: Fix deploy-endorsed Modified: stack/native/trunk/ant-import/build-deploy.xml =================================================================== --- stack/native/trunk/ant-import/build-deploy.xml 2008-02-28 07:50:52 UTC (rev 5830) +++ stack/native/trunk/ant-import/build-deploy.xml 2008-02-28 07:55:53 UTC (rev 5831) @@ -27,7 +27,7 @@ <macro-deploy-native421 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss421-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss421.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  @@ -41,7 +41,7 @@ <macro-deploy-native422 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss422.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  @@ -56,7 +56,7 @@ <macro-deploy-native423 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss423.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  @@ -70,7 +70,7 @@ <macro-deploy-native500 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss500.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>  @@ -87,7 +87,7 @@ <macro-deploy-native501 stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-deploy-endorsed jbosshome="${jboss501.home}" stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> + <macro-deploy-endorsed stacklibs="${core.dir}/output/lib" thirdpartylibs="${core.dir}/thirdparty"/> </target>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5830 - in framework/trunk/hudson/hudson-home/jobs: CXF-Distro-AS-4.2.3 and 13 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-28 02:50:52 -0500 (Thu, 28 Feb 2008) New Revision: 5830 Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml Log: [JBWS-1989] Check installation instruction and build-bin-dist Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.2/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-cxf-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss422 # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-4.2.3/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-cxf-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss423 # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.0/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -33,6 +33,7 @@ # Deploy distro # cd output/jbossws-cxf-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss500 # Modified: framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/CXF-Distro-AS-5.0.1/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-cxf-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss501 # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.2/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -32,6 +32,7 @@ # Deploy distro # cd output/jbossws-metro-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss422 # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-4.2.3/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -32,6 +32,7 @@ # Deploy distro # cd output/jbossws-metro-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss423 # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.0/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -32,6 +32,7 @@ # Deploy distro # cd output/jbossws-metro-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss500 # Modified: framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Metro-Distro-AS-5.0.1/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -32,6 +32,7 @@ # Deploy distro # cd output/jbossws-metro-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss501 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.1/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss421 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss422 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.2-JDK6/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -41,6 +41,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss422 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss423 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-4.2.3-JDK6/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -41,6 +41,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss423 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss500 # Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-28 07:23:17 UTC (rev 5829) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-02-28 07:50:52 UTC (rev 5830) @@ -31,6 +31,7 @@ # Deploy distro # cd output/jbossws-native-dist +cp ant.properties.example ant.properties ./build.sh $ENVIRONMENT deploy-jboss501 #

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5829 - in stack/native/trunk/src/main/java/org/jboss/ws/core: client and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: mageshbk(a)jboss.com Date: 2008-02-28 02:23:17 -0500 (Thu, 28 Feb 2008) New Revision: 5829 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java Log: [JBWS-1820] Using JRE from vendors other than Sun the Remoting key store and trust store algorithms are not propagated Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/StubExt.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -41,14 +41,24 @@ { /** ClientTimeout property: org.jboss.ws.timeout */ static final String PROPERTY_CLIENT_TIMEOUT = "org.jboss.ws.timeout"; + /** Key Alias property: org.jboss.ws.keyAlias */ + static final String PROPERTY_KEY_ALIAS = "org.jboss.ws.keyAlias"; /** KeyStore property: org.jboss.ws.keyStore */ static final String PROPERTY_KEY_STORE = "org.jboss.ws.keyStore"; + /** KeyStore Management Algorithm property: org.jboss.ws.keyStoreAlgorithm */ + static final String PROPERTY_KEY_STORE_ALGORITHM = "org.jboss.ws.keyStoreAlgorithm"; /** KeyStorePassword property: org.jboss.ws.keyStorePassword */ static final String PROPERTY_KEY_STORE_PASSWORD = "org.jboss.ws.keyStorePassword"; /** KeyStoreType property: org.jboss.ws.keyStoreType */ static final String PROPERTY_KEY_STORE_TYPE = "org.jboss.ws.keyStoreType"; + /** Remoting SSL Protocol property: org.jboss.ws.sslProtocol */ + static final String PROPERTY_SSL_PROTOCOL = "org.jboss.ws.sslProtocol"; + /** Remoting SSL Provider Name property: org.jboss.ws.sslProviderName */ + static final String PROPERTY_SSL_PROVIDER_NAME = "org.jboss.ws.sslProviderName"; /** TrustStore property: org.jboss.ws.trustStore */ static final String PROPERTY_TRUST_STORE = "org.jboss.ws.trustStore"; + /** TrustStore Management Algorithm property: org.jboss.ws.trustStoreAlgorithm */ + static final String PROPERTY_TRUST_STORE_ALGORITHM = "org.jboss.ws.trustStoreAlgorithm"; /** TrustStorePassword property: org.jboss.ws.trustStorePassword */ static final String PROPERTY_TRUST_STORE_PASSWORD = "org.jboss.ws.trustStorePassword"; /** TrustStoreType property: org.jboss.ws.trustStoreType */ Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/client/HTTPRemotingConnection.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -90,10 +90,15 @@ private static Map<String, String> configMap = new HashMap<String, String>(); static { + configMap.put(StubExt.PROPERTY_KEY_ALIAS, "org.jboss.remoting.keyAlias"); configMap.put(StubExt.PROPERTY_KEY_STORE, "org.jboss.remoting.keyStore"); + configMap.put(StubExt.PROPERTY_KEY_STORE_ALGORITHM, "org.jboss.remoting.keyStoreAlgorithm"); configMap.put(StubExt.PROPERTY_KEY_STORE_PASSWORD, "org.jboss.remoting.keyStorePassword"); configMap.put(StubExt.PROPERTY_KEY_STORE_TYPE, "org.jboss.remoting.keyStoreType"); + configMap.put(StubExt.PROPERTY_SSL_PROTOCOL, "org.jboss.remoting.sslProtocol"); + configMap.put(StubExt.PROPERTY_SSL_PROVIDER_NAME, "org.jboss.remoting.sslProviderName"); configMap.put(StubExt.PROPERTY_TRUST_STORE, "org.jboss.remoting.trustStore"); + configMap.put(StubExt.PROPERTY_TRUST_STORE_ALGORITHM, "org.jboss.remoting.truststoreAlgorithm"); configMap.put(StubExt.PROPERTY_TRUST_STORE_PASSWORD, "org.jboss.remoting.trustStorePassword"); configMap.put(StubExt.PROPERTY_TRUST_STORE_TYPE, "org.jboss.remoting.trustStoreType"); } Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-02-27 20:14:17 UTC (rev 5828) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/jaxrpc/client/PortProxy.java 2008-02-28 07:23:17 UTC (rev 5829) @@ -78,10 +78,15 @@ static { legacyPropertyMap.put("org.jboss.webservice.client.timeout", StubExt.PROPERTY_CLIENT_TIMEOUT); + legacyPropertyMap.put("org.jboss.webservice.keyAlias", StubExt.PROPERTY_KEY_ALIAS); legacyPropertyMap.put("org.jboss.webservice.keyStore", StubExt.PROPERTY_KEY_STORE); + legacyPropertyMap.put("org.jboss.webservice.keyStoreAlgorithm", StubExt.PROPERTY_KEY_STORE_ALGORITHM); legacyPropertyMap.put("org.jboss.webservice.keyStorePassword", StubExt.PROPERTY_KEY_STORE_PASSWORD); legacyPropertyMap.put("org.jboss.webservice.keyStoreType", StubExt.PROPERTY_KEY_STORE_TYPE); + legacyPropertyMap.put("org.jboss.webservice.sslProtocol", StubExt.PROPERTY_SSL_PROTOCOL); + legacyPropertyMap.put("org.jboss.webservice.sslProviderName", StubExt.PROPERTY_SSL_PROVIDER_NAME); legacyPropertyMap.put("org.jboss.webservice.trustStore", StubExt.PROPERTY_TRUST_STORE); + legacyPropertyMap.put("org.jboss.webservice.trustStoreAlgorithm", StubExt.PROPERTY_TRUST_STORE_ALGORITHM); legacyPropertyMap.put("org.jboss.webservice.trustStorePassword", StubExt.PROPERTY_TRUST_STORE_PASSWORD); legacyPropertyMap.put("org.jboss.webservice.trustStoreType", StubExt.PROPERTY_TRUST_STORE_TYPE); }

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5828 - stack/native/trunk/src/test/resources.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 15:14:17 -0500 (Wed, 27 Feb 2008) New Revision: 5828 Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt Log: [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment Modified: stack/native/trunk/src/test/resources/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-02-27 20:00:50 UTC (rev 5827) +++ stack/native/trunk/src/test/resources/test-excludes-jboss501.txt 2008-02-27 20:14:17 UTC (rev 5828) @@ -22,3 +22,6 @@ # [JBAS-5115] Valid jboss-app.xml file not recognized correctly by jbossxb runtime org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.* +# [JBAS-5257] jboss:service=defaultClassLoader is not registered with dynamic webapp deployment +org/jboss/test/ws/jaxws/endpoint/** +

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5827 - in stack/native/trunk/src: test/java/org/jboss/test/ws/jaxws/epr and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 15:00:50 -0500 (Wed, 27 Feb 2008) New Revision: 5827 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java Log: [JBWS-1844] Implement Provider.createW3CEndpointReference Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2008-02-27 17:06:32 UTC (rev 5826) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2008-02-27 20:00:50 UTC (rev 5827) @@ -285,7 +285,7 @@ SOAPElement wsaRelatesTo = soapHeader.addChildElement(new NameImpl(ADDR.getRelatesToQName())); if (rel.getType() != null) { - wsaRelatesTo.setAttribute(ADDR.getRelationshipTypeName(), getPrefixedName(rel.getType())); + wsaRelatesTo.setAttribute(ADDR.getRelationshipTypeName(), getQualifiedName(rel.getType())); } wsaRelatesTo.addTextNode(rel.getID().toString()); } @@ -298,7 +298,7 @@ for (Object obj : refParams.getElements()) { SOAPElement refElement = appendElement(soapHeader, obj); - QName refQName = new QName(getNamespaceURI(), "IsReferenceParameter"); + QName refQName = new QName(ADDR.getNamespaceURI(), "IsReferenceParameter", ADDR.getNamespacePrefix()); refElement.addAttribute(refQName, "true"); } } @@ -337,7 +337,7 @@ { for (QName qname : attributes.keySet()) { - String qualname = getPrefixedName(qname); + String qualname = getQualifiedName(qname); String value = attributes.get(qname); soapElement.setAttribute(qualname, value); } @@ -395,7 +395,7 @@ } } - private String getPrefixedName(QName qname) + private String getQualifiedName(QName qname) { String prefix = qname.getPrefix(); String localPart = qname.getLocalPart(); Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2008-02-27 17:06:32 UTC (rev 5826) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/EndpointReferenceTestCase.java 2008-02-27 20:00:50 UTC (rev 5827) @@ -79,6 +79,6 @@ TestEndpoint port = service.getPort(epr, TestEndpoint.class); ((StubExt)port).setConfigName("Standard WSAddressing Client"); String retStr = port.echo("hello"); - assertEquals("hello", retStr); + assertEquals("hello|123456789|ABCDEFG", retStr); } } Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java 2008-02-27 17:06:32 UTC (rev 5826) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxws/epr/TestEndpointImpl.java 2008-02-27 20:00:50 UTC (rev 5827) @@ -30,6 +30,7 @@ import javax.jws.WebMethod; import javax.jws.WebService; import javax.jws.soap.SOAPBinding; +import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPMessage; import javax.xml.ws.WebServiceContext; import javax.xml.ws.addressing.JAXWSAConstants; @@ -70,7 +71,7 @@ ReferenceParameters refParams = addrProps.getReferenceParameters(); for (Object refParam : refParams.getElements()) { - input += "|" + ((Element)refParam).getNodeValue(); + input += "|" + ((SOAPElement)refParam).getValue(); } } catch (Exception ex)

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5826 - in stack/cxf/trunk: src/main/distro and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 12:06:32 -0500 (Wed, 27 Feb 2008) New Revision: 5826 Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml stack/cxf/trunk/ant-import/build-deploy.xml stack/cxf/trunk/ant-import/macros-deploy-cxf.xml stack/cxf/trunk/src/main/distro/bin-dist-build.xml stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix bin-dist deployment. Fix chmod of deployed *.sh files Modified: stack/cxf/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/build-bin-dist.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -47,7 +47,7 @@  <copy todir="${bindist.build.dir}"> <fileset dir="${cxf.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> + <include name="jbossws.default.undeploy.files"/> <include name="macros-deploy-cxf.xml"/> </fileset> </copy> Modified: stack/cxf/trunk/ant-import/build-deploy.xml =================================================================== --- stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/build-deploy.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -15,12 +15,14 @@ <import file="${int.cxf.dir}/ant-import/macros-deploy-cxf.xml"/> + <property name="deploy.dir" value="${int.cxf.dir}/output/deploy"/> + <property name="jbossws.default.undeploy.files" value="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files"/> +    <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf422 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -33,7 +35,6 @@  <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/cxf to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf423 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -46,7 +47,6 @@  <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf500 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> @@ -59,7 +59,6 @@  <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/cxf to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.cxf.dir}/thirdparty"/> <macro-deploy-cxf501 stacklibs="${int.cxf.dir}/output/lib" thirdpartylibs="${int.cxf.dir}/thirdparty"/> </target> Modified: stack/cxf/trunk/ant-import/macros-deploy-cxf.xml =================================================================== --- stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/ant-import/macros-deploy-cxf.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -44,18 +44,17 @@ <sequential>  - <unzip dest="${cxf.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="${cxf.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <unzip dest="${deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>  - <copy todir="${cxf.output.deploy.dir}/client"> + <copy todir="${deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy>  - <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -81,16 +80,17 @@ <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>  - <fileset id="jbossws.deploy.files" dir="${cxf.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/> <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>  <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${cxf.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${cxf.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${cxf.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/> </sequential> </macrodef> @@ -103,10 +103,10 @@ <attribute name="jbosshome"/> <sequential> - <delete dir="${cxf.output.deploy.dir}"/> + <delete dir="${deploy.dir}"/> <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> - <loadfile property="jbossws.undeploy.files" srcfile="${int.cxf.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <delete> @@ -126,8 +126,8 @@ <sequential>  - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -137,8 +137,8 @@ </copy>  - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> @@ -156,6 +156,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -178,6 +179,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-cxf42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -201,8 +203,8 @@ <sequential>  - <mkdir dir="${cxf.output.deploy.dir}/client"/> - <copy todir="${cxf.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -212,15 +214,15 @@ </copy>  - <mkdir dir="${cxf.output.deploy.dir}/lib"/> - <copy todir="${cxf.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> </copy>  - <copy todir="${cxf.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -238,6 +240,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -260,6 +263,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-cxf50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-cxf50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> Modified: stack/cxf/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -19,11 +19,14 @@ <property name="build.dir" value="${basedir}/build"/> <property name="bin.dir" value="${basedir}/bin"/> + <property name="deploy.dir" value="${basedir}/output/deploy"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${basedir}/output"/> + <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/> + <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -85,7 +88,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-cxf.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Modified: stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) +++ stack/cxf/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 17:06:32 UTC (rev 5826) @@ -20,20 +20,15 @@  <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/cxf to jboss422"> <macro-deploy-cxf422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> </target>  - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/cxf from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/cxf from jboss422"> <macro-undeploy-cxf422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target>   @@ -42,20 +37,15 @@  <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/cxf to jboss423"> <macro-deploy-cxf423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/> </target>  - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/cxf from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/cxf from jboss423"> <macro-undeploy-cxf423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target>   @@ -64,7 +54,6 @@  <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/cxf to jboss500"> <macro-deploy-cxf500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> @@ -73,7 +62,6 @@  <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/cxf from jboss500"> <macro-undeploy-cxf500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target>  @@ -83,7 +71,6 @@  <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/cxf to jboss501"> <macro-deploy-cxf501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/> @@ -92,7 +79,6 @@  <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/cxf from jboss501"> <macro-undeploy-cxf501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r5825 - in stack/metro/trunk: src/main/distro and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-02-27 11:59:27 -0500 (Wed, 27 Feb 2008) New Revision: 5825 Modified: stack/metro/trunk/ant-import/build-bin-dist.xml stack/metro/trunk/ant-import/build-deploy.xml stack/metro/trunk/ant-import/macros-deploy-metro.xml stack/metro/trunk/src/main/distro/bin-dist-build.xml stack/metro/trunk/src/main/distro/bin-dist-deploy.xml Log: Fix bin-dist deployment. Fix chmod of deployed *.sh files Modified: stack/metro/trunk/ant-import/build-bin-dist.xml =================================================================== --- stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:51:51 UTC (rev 5824) +++ stack/metro/trunk/ant-import/build-bin-dist.xml 2008-02-27 16:59:27 UTC (rev 5825) @@ -47,7 +47,7 @@  <copy todir="${bindist.build.dir}"> <fileset dir="${metro.dir}/ant-import"> - <include name="macros-deploy-framework.xml"/> + <include name="jbossws.default.undeploy.files"/> <include name="macros-deploy-metro.xml"/> </fileset> </copy> Modified: stack/metro/trunk/ant-import/build-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) +++ stack/metro/trunk/ant-import/build-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) @@ -14,13 +14,15 @@ <project> <import file="${int.metro.dir}/ant-import/macros-deploy-metro.xml"/> + + <property name="deploy.dir" value="${int.metro.dir}/output/deploy"/> + <property name="jbossws.default.undeploy.files" value="${int.metro.dir}/ant-import/jbossws.default.undeploy.files"/>    <target name="deploy-jboss422" depends="jars-jboss42,undeploy-jboss422" description="Deploy jbossws/metro to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> <macro-deploy-metro422 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> @@ -33,7 +35,6 @@  <target name="deploy-jboss423" depends="jars-jboss42,undeploy-jboss423" description="Deploy jbossws/metro to jboss42"> - <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> <macro-deploy-metro423 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> @@ -46,7 +47,6 @@  <target name="deploy-jboss500" depends="jars-jboss50,undeploy-jboss500" description="Deploy jbossws/metro to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> <macro-deploy-metro500 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> @@ -59,7 +59,6 @@  <target name="deploy-jboss501" depends="jars-jboss50,undeploy-jboss501" description="Deploy jbossws/metro to jboss50"> - <macro-deploy-framework thirdpartylibs="${int.metro.dir}/thirdparty"/> <macro-deploy-metro501 stacklibs="${int.metro.dir}/output/lib" thirdpartylibs="${int.metro.dir}/thirdparty"/> </target> Modified: stack/metro/trunk/ant-import/macros-deploy-metro.xml =================================================================== --- stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-27 16:51:51 UTC (rev 5824) +++ stack/metro/trunk/ant-import/macros-deploy-metro.xml 2008-02-27 16:59:27 UTC (rev 5825) @@ -52,18 +52,17 @@ <sequential>  - <unzip dest="${metro.output.deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/> - <chmod dir="${metro.output.deploy.dir}/bin" perm="+x" includes="*.sh"/> + <unzip dest="${deploy.dir}/bin" src="@{thirdpartylibs}/jbossws-framework-scripts.zip"/>  - <copy todir="${metro.output.deploy.dir}/client"> + <copy todir="${deploy.dir}/client"> <fileset dir="@{thirdpartylibs}"> <patternset refid="client.patternset"/> </fileset> </copy>  - <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib"> <fileset dir="@{thirdpartylibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -89,16 +88,17 @@ <unzip dest="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>  - <fileset id="jbossws.deploy.files" dir="${metro.output.deploy.dir}" excludes="jbossws.deployed.files"/> + <fileset id="jbossws.deploy.files" dir="${deploy.dir}" excludes="jbossws.deployed.files"/> <copy todir="@{jbosshome}" overwrite="true"> <fileset refid="jbossws.deploy.files"/> </copy> + <chmod dir="@{jbosshome}/bin" perm="+x" includes="*.sh"/>  <property name="jbossws.deploy.files" refid="jbossws.deploy.files"/> - <echo file="${metro.output.deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> - <replace file="${metro.output.deploy.dir}/jbossws.deployed.files" token=";" value=" "/> - <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${metro.output.deploy.dir}/jbossws.deployed.files" overwrite="true"/> + <echo file="${deploy.dir}/jbossws.deployed.files" message="${jbossws.deploy.files}"/> + <replace file="${deploy.dir}/jbossws.deployed.files" token=";" value=" "/> + <copy todir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar" file="${deploy.dir}/jbossws.deployed.files" overwrite="true"/> </sequential> </macrodef> @@ -111,10 +111,10 @@ <attribute name="jbosshome"/> <sequential> - <delete dir="${metro.output.deploy.dir}"/> + <delete dir="${deploy.dir}"/> <loadfile property="jbossws.undeploy.files" srcfile="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar/jbossws.deployed.files" failonerror="false"/> - <loadfile property="jbossws.undeploy.files" srcfile="${int.metro.dir}/ant-import/jbossws.default.undeploy.files" failonerror="false"/> + <loadfile property="jbossws.undeploy.files" srcfile="${jbossws.default.undeploy.files}" failonerror="false"/> <property name="jbossws.undeploy.files" value="nothing.to.undeploy"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/jbossws.sar"/> <delete dir="@{jbosshome}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> @@ -135,8 +135,8 @@ <sequential>  - <mkdir dir="${metro.output.deploy.dir}/client"/> - <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -146,8 +146,8 @@ </copy>  - <mkdir dir="${metro.output.deploy.dir}/lib"/> - <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> @@ -165,6 +165,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss422.available.file}" unless="jboss422.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss422.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -187,6 +188,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss423.available.file}" unless="jboss423.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-metro42x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss423.home}" sarname="jbossws-metro42.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -210,8 +212,8 @@ <sequential>  - <mkdir dir="${metro.output.deploy.dir}/client"/> - <copy todir="${metro.output.deploy.dir}/client" overwrite="true"> + <mkdir dir="${deploy.dir}/client"/> + <copy todir="${deploy.dir}/client" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="client.patternset"/> </fileset> @@ -221,15 +223,15 @@ </copy>  - <mkdir dir="${metro.output.deploy.dir}/lib"/> - <copy todir="${metro.output.deploy.dir}/lib" overwrite="true"> + <mkdir dir="${deploy.dir}/lib"/> + <copy todir="${deploy.dir}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> <patternset refid="lib.patternset"/> </fileset> </copy>  - <copy todir="${metro.output.deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> + <copy todir="${deploy.dir}/server/${jboss.server.instance}/lib" overwrite="true"> <fileset dir="@{stacklibs}"> <patternset refid="server.lib.patternset"/> </fileset> @@ -247,6 +249,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss500.available.file}" unless="jboss500.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss500.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> @@ -269,6 +272,7 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> + <macro-deploy-framework thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-metro50x stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> <macro-deploy-jbossws jbosshome="${jboss501.home}" sarname="jbossws-metro50.sar" stacklibs="@{stacklibs}" thirdpartylibs="@{thirdpartylibs}"/> </sequential> Modified: stack/metro/trunk/src/main/distro/bin-dist-build.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:51:51 UTC (rev 5824) +++ stack/metro/trunk/src/main/distro/bin-dist-build.xml 2008-02-27 16:59:27 UTC (rev 5825) @@ -19,11 +19,14 @@ <property name="build.dir" value="${basedir}/build"/> <property name="bin.dir" value="${basedir}/bin"/> + <property name="deploy.dir" value="${basedir}/output/deploy"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> <property name="tests.dir" value="${basedir}/tests"/> <property name="tests.output.dir" value="${basedir}/output"/> + <property name="jbossws.default.undeploy.files" value="${build.dir}/jbossws.default.undeploy.files"/> + <property file="${basedir}/ant.properties"/> <property file="${basedir}/version.properties"/> @@ -74,8 +77,8 @@ </condition> <condition property="jbossws.integration.jboss50" value="true"> <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss500"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> </or> </condition> @@ -86,7 +89,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-metro.xml"/> <import file="${basedir}/tests/ant-import/build-testsuite.xml"/> Modified: stack/metro/trunk/src/main/distro/bin-dist-deploy.xml =================================================================== --- stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:51:51 UTC (rev 5824) +++ stack/metro/trunk/src/main/distro/bin-dist-deploy.xml 2008-02-27 16:59:27 UTC (rev 5825) @@ -20,20 +20,15 @@  <target name="deploy-jboss422" depends="undeploy-jboss422,deploy-jboss422-endorsed" description="Deploy jbossws/metro to jboss422"> <macro-deploy-metro422 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss422.home}"/> </target> <target name="deploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss422.home}" thirdpartylibs="${lib.dir}"/> </target>  - <target name="undeploy-jboss422" depends="prepare,undeploy-jboss422-endorsed" description="Remove jbossws/metro from jboss422"> + <target name="undeploy-jboss422" depends="prepare" description="Remove jbossws/metro from jboss422"> <macro-undeploy-metro422/> - <macro-undeploy-framework jbosshome="${jboss422.home}"/> </target> - <target name="undeploy-jboss422-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss422.home}"/> - </target>   @@ -42,20 +37,15 @@  <target name="deploy-jboss423" depends="undeploy-jboss423,deploy-jboss423-endorsed" description="Deploy jbossws/metro to jboss423"> <macro-deploy-metro423 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss423.home}"/> </target> <target name="deploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss423.home}" thirdpartylibs="${lib.dir}"/> </target>  - <target name="undeploy-jboss423" depends="prepare,undeploy-jboss423-endorsed" description="Remove jbossws/metro from jboss423"> + <target name="undeploy-jboss423" depends="prepare" description="Remove jbossws/metro from jboss423"> <macro-undeploy-metro423/> - <macro-undeploy-framework jbosshome="${jboss423.home}"/> </target> - <target name="undeploy-jboss423-endorsed" depends="prepare" if="HAVE_JDK_1.6"> - <macro-undeploy-endorsed jbosshome="${jboss423.home}"/> - </target>   @@ -64,7 +54,6 @@  <target name="deploy-jboss500" depends="undeploy-jboss500,deploy-jboss500-endorsed" description="Deploy jbossws/metro to jboss500"> <macro-deploy-metro500 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss500.home}"/> </target> <target name="deploy-jboss500-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss500.home}" thirdpartylibs="${lib.dir}"/> @@ -73,7 +62,6 @@  <target name="undeploy-jboss500" depends="prepare" description="Remove jbossws/metro from jboss500"> <macro-undeploy-metro500/> - <macro-undeploy-framework jbosshome="${jboss500.home}"/> </target>  @@ -83,7 +71,6 @@  <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-jboss501-endorsed" description="Deploy jbossws/metro to jboss501"> <macro-deploy-metro501 stacklibs="${lib.dir}" thirdpartylibs="${lib.dir}"/> - <macro-deploy-framework thirdpartylibs="${lib.dir}" jbosshome="${jboss501.home}"/> </target> <target name="deploy-jboss501-endorsed" depends="prepare" if="HAVE_JDK_1.6"> <macro-deploy-endorsed jbosshome="${jboss501.home}" thirdpartylibs="${lib.dir}"/> @@ -92,7 +79,6 @@  <target name="undeploy-jboss501" depends="prepare" description="Remove jbossws/metro from jboss501"> <macro-undeploy-metro501/> - <macro-undeploy-framework jbosshome="${jboss501.home}"/> </target> </project> \ No newline at end of file

16 years, 7 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 February 2008