March 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r5994 - in stack/native/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-18 06:55:56 -0400 (Tue, 18 Mar 2008) New Revision: 5994 Added: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml Modified: stack/native/trunk/ant-import/build-thirdparty.xml stack/native/trunk/build.xml stack/native/trunk/src/main/resources/jbossws-native-config.xml Log: [JBWS-1922] Moving AS42 container config to the stack code base Modified: stack/native/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:48:19 UTC (rev 5993) +++ stack/native/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:55:56 UTC (rev 5994) @@ -63,7 +63,6 @@ <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi-src.zip" dest="${thirdparty.dir}/jbossws-spi-src.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42.jar" dest="${thirdparty.dir}/jbossws-jboss421.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-src.zip" dest="${thirdparty.dir}/jbossws-jboss421-src.zip" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-ant/${apache-ant}/lib/ant.jar" dest="${thirdparty.dir}/ant.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/apache-collections/${apache-collections}/lib/commons-collections.jar" dest="${thirdparty.dir}/commons-collections.jar" usetimestamp="true" verbose="true"/> Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2008-03-18 10:48:19 UTC (rev 5993) +++ stack/native/trunk/build.xml 2008-03-18 10:55:56 UTC (rev 5994) @@ -195,13 +195,12 @@ </concat>  - <unzip dest="${core.output.dir}/resources" src="${thirdparty.dir}/jbossws-jboss42-resources.zip"/> <concat destfile="${core.output.resources.dir}/jbossws-native42-beans.xml"> <header trimleading="yes"> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" xmlns="urn:jboss:bean-deployer"> </header> <fileset file="${core.resources.dir}/jbossws-native-config.xml"/> - <fileset file="${core.output.resources.dir}/jbossws-jboss42-config.xml"/> + <fileset file="${core.resources.dir}/jbossws-jboss42-config.xml"/> <footer trimleading="yes"> </deployment> </footer> Added: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml (rev 0) +++ stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml 2008-03-18 10:55:56 UTC (rev 5994) @@ -0,0 +1,294 @@ + +  + <bean name="WSKernelLocator" class="org.jboss.wsf.spi.util.KernelLocator"> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property> + </bean> + +  + <bean name="WSMBeanServerLocator" class="org.jboss.wsf.framework.management.MBeanServerLocator"/> + +  + <bean name="WSHTTPServer" class="org.jboss.wsf.container.jboss42.DeploymentAspectHttpServer"/> + +  + <bean name="WSServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + <bean name="ServiceRefHandler" class="org.jboss.wsf.container.jboss42.serviceref.ServiceRefHandlerImpl"/> + +  + +  + +  + <bean name="WSDeployerHook_JAXRPC_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXRPC_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXRPC_EJB21" class="org.jboss.wsf.container.jboss42.JAXRPCDeployerHookEJB21"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB21</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_PRE_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPreJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPreJSE</property> + <property name="phaseOneInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + +  + <bean name="WSDeployerHook_JAXWS_POST_JSE" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookPostJSE"> + <property name="deploymentManagerName">WSDeploymentAspectManagerPostJSE</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorJSE</value> + </list> + </property> + </bean> + + <bean name="WSDeployerHook_JAXWS_EJB3" class="org.jboss.wsf.container.jboss42.JAXWSDeployerHookEJB3"> + <property name="deploymentManagerName">WSDeploymentAspectManagerEJB</property> + <property name="phaseTwoInterceptors"> + <list class="java.util.LinkedList" elementClass="javax.management.ObjectName"> + <value>jboss.ws:service=DeployerInterceptorEJB3</value> + </list> + </property> + </bean> + +  + <bean name="WSDeploymentAspectManagerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerPreJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="parent"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="name">WSDeploymentAspectManagerPostJSE</property> + </bean> + <bean name="WSDeploymentAspectManagerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEJB</property> + </bean> + <bean name="WSDeploymentAspectManagerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectManagerImpl"> + <property name="name">WSDeploymentAspectManagerEndpointAPI</property> + </bean> + +  + <bean name="WSContainerMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ContainerMetaDataDeploymentAspect"> + <property name="provides">ContainerMetaData, VFSRoot</property> + <property name="metaDataAdapter"><inject bean="WSContainerMetaDataAdapter"/></property> + </bean> + + <bean name="WSContextRootDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleContextRootDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContextRoot</property> + </bean> + + <bean name="WSEndpointAPIDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAPIDeploymentAspect"> + <property name="provides">ContainerMetaData, RuntimeLoader, URLPattern, VFSRoot</property> + </bean> + + <bean name="WSEndpointAddressDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointAddressDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointAddress</property> + </bean> + + <bean name="WSEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">ContainerEndpointHandler</property> + </bean> + + <bean name="WSEndpointLifecycleDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointLifecycleDeploymentAspect"> + <property name="requires">LAST_DEPLOYMENT_ASPECT</property> + </bean> + + <bean name="WSEndpointMetricsDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointMetricsDeploymentAspect"> + <property name="provides">EndpointMetrics</property> + </bean> + + <bean name="WSEndpointNameDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointNameDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">EndpointName</property> + </bean> + + <bean name="WSEndpointRegistryDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRegistryDeploymentAspect"> + <property name="requires">EndpointName</property> + <property name="provides">RegisteredEndpoint</property> + <depends>WSEndpointRegistry</depends> + </bean> + + <bean name="WSModifyWebMetaDataDeploymentAspect" class="org.jboss.wsf.container.jboss42.ModifyWebMetaDataDeploymentAspect"> + <property name="requires">ContextProperties, ContainerMetaData, StackDescriptor</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSRuntimeLoaderDeploymentAspect" class="org.jboss.wsf.container.jboss42.RuntimeLoaderDeploymentAspect"> + <property name="requires">ContainerMetaData</property> + <property name="provides">RuntimeLoader</property> + </bean> + + <bean name="WSURLPatternDeploymentAspect" class="org.jboss.wsf.framework.deployment.BackwardCompatibleURLPatternDeploymentAspect"> + <property name="requires">ContextRoot, ContainerMetaData</property> + <property name="provides">URLPattern</property> + </bean> + + <bean name="WSWebAppDeploymentAspect" class="org.jboss.wsf.container.jboss42.WebAppDeploymentAspect"> + <property name="requires">WebMetaData, ContextProperties</property> + <property name="webXMLRewriter"><inject bean="WSWebXMLRewriter"/></property> + </bean> + + <bean name="WSWebAppGeneratorDeploymentAspect" class="org.jboss.wsf.framework.deployment.WebAppGeneratorDeploymentAspect"> + <property name="requires">URLPattern</property> + <property name="provides">WebMetaData</property> + <property name="securityHandlerEJB21"><inject bean="WSSecurityHandlerEJB21"/></property> + <property name="securityHandlerEJB3"><inject bean="WSSecurityHandlerEJB3"/></property> + </bean> + +  + <bean name="WSApplicationMetaDataAdapterEJB21" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB21"/> + <bean name="WSApplicationMetaDataAdapterEJB3" class="org.jboss.wsf.container.jboss42.EJBArchiveMetaDataAdapterEJB3"/> + <bean name="WSContainerMetaDataAdapter" class="org.jboss.wsf.container.jboss42.ContainerMetaDataAdapter"> + <property name="applicationMetaDataAdapterEJB21"><inject bean="WSApplicationMetaDataAdapterEJB21"/></property> + <property name="applicationMetaDataAdapterEJB3"><inject bean="WSApplicationMetaDataAdapterEJB3"/></property> + <property name="webMetaDataAdapter"><inject bean="WSWebMetaDataAdapter"/></property> + </bean> + <bean name="WSSecurityHandlerEJB21" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB21"/> + <bean name="WSSecurityHandlerEJB3" class="org.jboss.wsf.container.jboss42.SecurityHandlerEJB3"/> + <bean name="WSWebAppDesciptorModifier" class="org.jboss.wsf.container.jboss42.DefaultWebAppDesciptorModifierImpl"/> + <bean name="WSWebMetaDataAdapter" class="org.jboss.wsf.container.jboss42.JSEArchiveMetaDataAdapter"/> + <bean name="WSWebXMLRewriter" class="org.jboss.wsf.container.jboss42.WebXMLRewriterImpl"> + <property name="desciptorModifier"><inject bean="WSWebAppDesciptorModifier"/></property> + </bean> + +  + <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> + <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> + </bean> + +  +  + <bean name="WSDeploymentAspectInstallerPreJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPreJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSModifyWebMetaDataDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + </set> + </property> + </bean> + +  + <bean name="WSDeploymentAspectInstallerPostJSE" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerPostJSE"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + </set> + </property> + <depends>WSDeploymentAspectInstallerPreJSE</depends> + </bean> + + <bean name="WSDeploymentAspectInstallerEJB" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEJB"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSContainerMetaDataDeploymentAspect"/> + <inject bean="WSContextRootDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSRuntimeLoaderDeploymentAspect"/> + <inject bean="WSURLPatternDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> + + <bean name="WSDeploymentAspectInstallerEndpointAPI" class="org.jboss.wsf.framework.deployment.DeploymentAspectInstaller"> + <property name="manager"><inject bean="WSDeploymentAspectManagerEndpointAPI"/></property> + <property name="sortAspectsOnCreate">false</property> + <property name="aspects"> + <set class="java.util.HashSet" elementClass="org.jboss.wsf.spi.deployment.DeploymentAspect"> + <inject bean="WSEndpointAPIDeploymentAspect"/> + <inject bean="WSEndpointAddressDeploymentAspect"/> + <inject bean="WSEndpointHandlerDeploymentAspect"/> + <inject bean="WSEndpointLifecycleDeploymentAspect"/> + <inject bean="WSEndpointMetricsDeploymentAspect"/> + <inject bean="WSEndpointNameDeploymentAspect"/> + <inject bean="WSEndpointRegistryDeploymentAspect"/> + <inject bean="WSWebAppDeploymentAspect"/> + <inject bean="WSWebAppGeneratorDeploymentAspect"/> + </set> + </property> + </bean> Property changes on: stack/native/trunk/src/main/resources/jbossws-jboss42-config.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: stack/native/trunk/src/main/resources/jbossws-native-config.xml =================================================================== --- stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 10:48:19 UTC (rev 5993) +++ stack/native/trunk/src/main/resources/jbossws-native-config.xml 2008-03-18 10:55:56 UTC (rev 5994) @@ -24,11 +24,6 @@ --> </bean> -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> -  <bean name="WSSubscriptionManager" class="org.jboss.ws.extensions.eventing.mgmt.SubscriptionManager"> <property name="bindAddress">${jboss.bind.address}</property>

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5993 - in stack/metro/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 06:48:19 -0400 (Tue, 18 Mar 2008) New Revision: 5993 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/src/main/etc/component-info50.xml stack/metro/trunk/version.properties Log: Pull FastInfoset from repo/sun-fi and not through repo/sun-jaxws Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:18:12 UTC (rev 5992) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 10:48:19 UTC (rev 5993) @@ -55,12 +55,12 @@ <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/jboss/jboss-javaee/${jboss-javaee}/lib/jboss-javaee.jar" dest="${thirdparty.dir}/jboss-javaee.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/junit/${junit}/lib/junit.jar" dest="${thirdparty.dir}/junit.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-fi/${sun-fi}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaf/${sun-jaf}/lib/activation.jar" dest="${thirdparty.dir}/activation.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-api.jar" dest="${thirdparty.dir}/jaxb-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-impl.jar" dest="${thirdparty.dir}/jaxb-impl.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxb/${sun-jaxb}/lib/jaxb-xjc.jar" dest="${thirdparty.dir}/jaxb-xjc.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> - <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/FastInfoset.jar" dest="${thirdparty.dir}/FastInfoset.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/http.jar" dest="${thirdparty.dir}/http.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-src.zip" dest="${thirdparty.dir}/jaxws-src.zip" usetimestamp="true" verbose="true"/> Modified: stack/metro/trunk/src/main/etc/component-info50.xml =================================================================== --- stack/metro/trunk/src/main/etc/component-info50.xml 2008-03-18 10:18:12 UTC (rev 5992) +++ stack/metro/trunk/src/main/etc/component-info50.xml 2008-03-18 10:48:19 UTC (rev 5993) @@ -1,23 +1,48 @@ <project name="jboss/jbossws-metro50"> - - <component id="jboss/jbossws-metro50" - description="JBossWS an implementation of J2EE Web Services" - version="@repository.id@" - licenseType="lgpl"> - - <artifact id="jbossws-metro50.sar"/> - <artifact id="jbossws-metro50-deployer.zip"/> - - <import componentref="jboss/microcontainer"> - <compatible version="@jboss-microcontainer@"/> - </import> - <import componentref="jboss/jbossws-spi"> - <compatible version="@repository.id@"/> - </import> - - <export> - </export> - - </component> - + + <component id="jboss/jbossws-metro50" + description="JBossWS an implementation of J2EE Web Services" + version="@repository.id@" + licenseType="lgpl"> + + <artifact id="jbossws-metro50.sar"/> + <artifact id="jbossws-metro50-deployer.zip"/> + + <import componentref="jboss/microcontainer"> + <compatible version="@jboss-microcontainer@"/> + </import> + + <import componentref="jboss/jbossws-common"> + <compatible version="@jbossws-common@"/> + </import> + <import componentref="jboss/jbossws-framework"> + <compatible version="@jbossws-framework@"/> + </import> + <import componentref="jboss/jbossws-spi"> + <compatible version="@jbossws-spi@"/> + </import> + + <import componentref="stax-api"> + <compatible version="@stax-api@"/> + </import> + <import componentref="sun-fi"> + <compatible version="@sun-fi@"/> + </import> + <import componentref="sun-jaxb"> + <compatible version="@sun-jaxb@"/> + </import> + <import componentref="sun-jaxws"> + <compatible version="@sun-jaxws@"/> + </import> + <import componentref="woodstox"> + <compatible version="@woodstox@"/> + <compatible version="@woodstox@-brew"/> + </import> + + <export> + </export> + + </component> + </project> + Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-03-18 10:18:12 UTC (rev 5992) +++ stack/metro/trunk/version.properties 2008-03-18 10:48:19 UTC (rev 5993) @@ -25,6 +25,7 @@ jboss-javaee=5.0.0.Beta3 jboss-jaxr=1.2.0.GA jboss-security-spi=2.0.0.Beta +sun-fi=1.2.2 sun-jaf=1.1 sun-jaxb=2.1.6 sun-jaxrpc=1.1

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5992 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 06:18:12 -0400 (Tue, 18 Mar 2008) New Revision: 5992 Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml stack/metro/trunk/ant-import/metro-build-adapter.xml Log: Rename the jarjar packaged resolver.jar that shipos with metro to wsit-resolver.jar, in order to avoid conflicts Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 09:34:29 UTC (rev 5991) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 10:18:12 UTC (rev 5992) @@ -89,7 +89,7 @@ <include name="**/jsr173_api.jar"/> <include name="**/jsr250-api.jar"/> <include name="**/mimepull.jar"/> - <include name="**/resolver.jar"/> + <include name="**/wsit-resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> <include name="**/sjsxp.jar"/> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 09:34:29 UTC (rev 5991) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 10:18:12 UTC (rev 5992) @@ -85,7 +85,7 @@ </fileset>  - + <fileset dir="${lib.runtime.dir}"> <include name="jaxws-local-transport.jar"/> <include name="stax-utils.jar"/> @@ -99,6 +99,10 @@ </copy> +  + <move file="${thirdparty.gen}/resolver.jar" tofile="${thirdparty.gen}/wsit-resolver.jar"/> + + </target> </project> \ No newline at end of file

16 years, 6 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-18 05:34:29 -0400 (Tue, 18 Mar 2008) New Revision: 5991 Modified: stack/metro/trunk/ant-import/build-thirdparty.xml stack/metro/trunk/ant-import/jbossws-deploy-macros.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/metro-trunk.iml stack/metro/trunk/version.properties Log: The Stax API was missing from deploy. The woodstax lib is pulled from repository and not the metro CVS Modified: stack/metro/trunk/ant-import/build-thirdparty.xml =================================================================== --- stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/build-thirdparty.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -77,6 +77,7 @@ <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/stax-ex.jar" dest="${thirdparty.dir}/stax-ex.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/streambuffer.jar" dest="${thirdparty.dir}/streambuffer.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/sun-servlet/${sun-servlet}/lib/servlet-api.jar" dest="${thirdparty.dir}/servlet-api.jar" usetimestamp="true" verbose="true"/> + <get src="${jboss.repository}/stax-api/${stax-api}/lib/stax-api.jar" dest="${thirdparty.dir}/stax-api.jar" usetimestamp="true" verbose="true"/> <get src="${jboss.repository}/woodstox/${woodstox}/lib/wstx.jar" dest="${thirdparty.dir}/wstx.jar" usetimestamp="true" verbose="true"/> <checksum file="${int.metro.dir}/version.properties" fileext=".md5"/> </target> Modified: stack/metro/trunk/ant-import/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/jbossws-deploy-macros.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -39,12 +39,14 @@ <include name="**/jboss-wsit-rt.jar"/> <include name="**/jboss-wsit-tools.jar"/> <include name="**/streambuffer.jar"/> + <include name="**/stax-api.jar"/> <include name="**/stax-ex.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> <include name="**/stax-api.jar"/> <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -67,6 +69,7 @@ <include name="**/jaxws-api.jar"/> <include name="**/jsr181-api.jar"/> <include name="**/saaj-api.jar"/> + <include name="**/stax-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> @@ -89,14 +92,13 @@ <include name="**/resolver.jar"/> <include name="**/saaj-api.jar"/> <include name="**/saaj-impl.jar"/> - <include name="**/sjsxp.jar"/> - <include name="**/stax-api.jar"/> + <include name="**/sjsxp.jar"/> <include name="**/stax-ex.jar"/> <include name="**/stax-utils.jar"/> <include name="**/streambuffer.jar"/> <include name="**/txnannprocessor.jar"/> <include name="**/wsdl4j.jar"/> - <include name="**/wstx-asl-3.2.1.jar"/> + <include name="**/wstx.jar"/> <include name="**/xmldsig.jar"/> <include name="**/xws-security.jar"/> </patternset> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-18 09:34:29 UTC (rev 5991) @@ -61,7 +61,6 @@ <available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/> <available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/> <available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/> - <available property="wstx-asl-3.2.1.available" filepath="${lib.runtime.dir}" file="wstx-asl-3.2.1.jar"/> <available property="xmldsig.available" filepath="${lib.runtime.dir}" file="xmldsig.jar"/> <available property="xws-security.available" filepath="${lib.runtime.dir}" file="xws-security.jar"/> <available property="resolver.available" filepath="${lib.runtime.dir}" file="resolver.jar"/> @@ -69,7 +68,6 @@ <fail message="jaxws-local-transport.jar not available" unless="jaxws-local-transport.available"/> <fail message="stax-utils.jar not available" unless="stax-utils.available"/> <fail message="txnannprocessor.jar not available" unless="txnannprocessor.available"/> - <fail message="wstx-asl-3.2.1.jar not available" unless="wstx-asl-3.2.1.available"/> <fail message="xmldsig.jar not available" unless="xmldsig.available"/> <fail message="xws-security.jar not available" unless="xws-security.available"/> <fail message="resolver.jar not available" unless="resolver.available"/> @@ -92,7 +90,6 @@ <include name="jaxws-local-transport.jar"/> <include name="stax-utils.jar"/> <include name="txnannprocessor.jar"/> - <include name="wstx-asl-3.2.1.jar"/> <include name="xmldsig.jar"/> <include name="xws-security.jar"/> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/metro-trunk.iml 2008-03-18 09:34:29 UTC (rev 5991) @@ -4,6 +4,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/jaxws-src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test-framework/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="false" /> @@ -274,87 +275,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/wstx-asl-3.2.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/stax-utils.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/xws-security.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/resolver.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jboss-wsit-rt.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/jaxws-local-transport.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/xmldsig.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/glassfish-metro/output/txnannprocessor.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/../../../framework/trunk/thirdparty/dom4j.jar!/" /> </CLASSES> <JAVADOC /> @@ -370,7 +290,6 @@ <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="jaxws-2.1.3-src" /> <orderEntryProperties /> </component> </module> Modified: stack/metro/trunk/version.properties =================================================================== --- stack/metro/trunk/version.properties 2008-03-18 09:14:28 UTC (rev 5990) +++ stack/metro/trunk/version.properties 2008-03-18 09:34:29 UTC (rev 5991) @@ -30,6 +30,7 @@ sun-jaxrpc=1.1 sun-jaxws=2.1.3 sun-servlet=2.5 +stax-api=1.0 ibm-wsdl4j=1.6.2 woodstox=3.1.1

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5990 - in framework/trunk/hudson/hudson-home: jobs and 9 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-18 05:14:28 -0400 (Tue, 18 Mar 2008) New Revision: 5990 Added: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/ Removed: framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxr-AS-4.2.3/ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Jaxrpc-AS-4.2.3/ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Saaj-AS-4.2.3/ framework/trunk/hudson/hudson-home/jobs/Native-Tck14-Webservices-AS-4.2.3/ framework/trunk/hudson/hudson-home/jobs/TCK-1.4/ Modified: framework/trunk/hudson/hudson-home/config.xml framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml Log: Add JDK6 runs, Remove unused TCK runs Modified: framework/trunk/hudson/hudson-home/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/config.xml 2008-03-18 07:15:27 UTC (rev 5989) +++ framework/trunk/hudson/hudson-home/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -63,19 +63,27 @@ <string>Native-Core-AS-4.2.3</string> <string>Native-Core-AS-4.2.3-JDK6</string> <string>Native-Core-AS-5.0.0</string> + <string>Native-Core-AS-5.0.0-JDK6</string> <string>Native-Core-AS-5.0.1</string> + <string>Native-Core-AS-5.0.1-JDK6</string> <string>Native-Distro-AS-4.2.1</string> <string>Native-Distro-AS-4.2.2</string> <string>Native-Distro-AS-4.2.2-JDK6</string> <string>Native-Distro-AS-4.2.3</string> <string>Native-Distro-AS-4.2.3-JDK6</string> <string>Native-Distro-AS-5.0.0</string> + <string>Native-Distro-AS-5.0.0-JDK6</string> <string>Native-Distro-AS-5.0.1</string> + <string>Native-Distro-AS-5.0.1-JDK6</string> <string>Native-Integration-AS-4.2.1</string> <string>Native-Integration-AS-4.2.2</string> + <string>Native-Integration-AS-4.2.2-JDK6</string> <string>Native-Integration-AS-4.2.3</string> + <string>Native-Integration-AS-4.2.3-JDK6</string> <string>Native-Integration-AS-5.0.0</string> + <string>Native-Integration-AS-5.0.0-JDK6</string> <string>Native-Integration-AS-5.0.1</string> + <string>Native-Integration-AS-5.0.1-JDK6</string> </jobNames> <name>Native Tests</name> <description> @@ -167,26 +175,6 @@ </description> </view> -  - <view> - <owner reference="../../.."/> - <jobNames class="tree-set"> - <no-comparator/> - <string>Native-Tck14-Jaxr-AS-4.2.3</string> - <string>Native-Tck14-Jaxrpc-AS-4.2.3</string> - <string>Native-Tck14-Saaj-AS-4.2.3</string> - <string>Native-Tck14-Webservices-AS-4.2.3</string> - </jobNames> - <name>TCK Native Tests</name> - <description> - <![CDATA[ - Run the WebService TCK. - <p/> - Make sure you have sucessfuly build the <a href="/hudson/view/Target%20Container">Target Container</a> and <a href="/hudson/job/TCK-1.4">TCK-1.4</a> -]]> - </description> - </view> -  <view> <owner reference="../../.."/> Modified: framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-03-18 07:15:27 UTC (rev 5989) +++ framework/trunk/hudson/hudson-home/jobs/Native-ALL/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -4,9 +4,9 @@ <publishers class="vector"> <hudson.tasks.BuildTrigger> <childProjects> - Native-Core-AS-4.2.1, Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6, Native-Core-AS-5.0.0, Native-Core-AS-5.0.1 - , Native-Distro-AS-4.2.1, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6, Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.1 - , Native-Integration-AS-4.2.1, Native-Integration-AS-4.2.2, Native-Integration-AS-4.2.3, Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.1 + Native-Core-AS-4.2.1, Native-Core-AS-4.2.2, Native-Core-AS-4.2.2-JDK6, Native-Core-AS-4.2.3, Native-Core-AS-4.2.3-JDK6, Native-Core-AS-5.0.0, Native-Core-AS-5.0.0-JDK6, Native-Core-AS-5.0.1, Native-Core-AS-5.0.1-JDK6 + , Native-Distro-AS-4.2.1, Native-Distro-AS-4.2.2, Native-Distro-AS-4.2.2-JDK6, Native-Distro-AS-4.2.3, Native-Distro-AS-4.2.3-JDK6, Native-Distro-AS-5.0.0, Native-Distro-AS-5.0.0-JDK6, Native-Distro-AS-5.0.1, Native-Distro-AS-5.0.1-JDK6 + , Native-Integration-AS-4.2.1, Native-Integration-AS-4.2.2, Native-Integration-AS-4.2.2-JDK6, Native-Integration-AS-4.2.3, Native-Integration-AS-4.2.3-JDK6, Native-Integration-AS-5.0.0, Native-Integration-AS-5.0.0-JDK6, Native-Integration-AS-5.0.1, Native-Integration-AS-5.0.1-JDK6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.0-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Core-AS-5.0.0 +MODULE=Native-Core-AS-5.0.0-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Core-AS-5.0.1-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Core-AS-5.0.1 +MODULE=Native-Core-AS-5.0.1-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.0-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Distro-AS-5.0.0 +MODULE=Native-Distro-AS-5.0.0-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Distro-AS-5.0.1-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Distro-AS-5.0.1 +MODULE=Native-Distro-AS-5.0.1-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.2-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Integration-AS-4.2.2 +MODULE=Native-Integration-AS-4.2.2-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss422 -Djboss422.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-4.2.3-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Integration-AS-4.2.3 +MODULE=Native-Integration-AS-4.2.3-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss423 -Djboss423.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.0-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Integration-AS-5.0.0 +MODULE=Native-Integration-AS-5.0.0-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss500 -Djboss500.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop Copied: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6 (from rev 5936, framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1) Modified: framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1/config.xml 2008-03-12 09:57:55 UTC (rev 5936) +++ framework/trunk/hudson/hudson-home/jobs/Native-Integration-AS-5.0.1-JDK6/config.xml 2008-03-18 09:14:28 UTC (rev 5990) @@ -6,7 +6,7 @@ # # Module settings # -MODULE=Native-Integration-AS-5.0.1 +MODULE=Native-Integration-AS-5.0.1-JDK6 WORKSPACE=`pwd` FRAMEWORKDIR=$WORKSPACE/framework @@ -16,6 +16,16 @@ ENVIRONMENT="-Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=jboss501 -Djboss501.home=$JBOSS_INSTANCE" # +# Verify JDK1.6 availablility +# +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="@java.home.jdk16@" +fi + +# # stop jbossas # $FRAMEWORKDIR/hudson/jboss/bin/jboss.sh $JBOSS_INSTANCE stop

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5989 - stack/metro/trunk/ant-import.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-03-18 03:15:27 -0400 (Tue, 18 Mar 2008) New Revision: 5989 Modified: stack/metro/trunk/ant-import/build-metro.xml Log: fix hudson regression Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-03-18 00:35:37 UTC (rev 5988) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-03-18 07:15:27 UTC (rev 5989) @@ -79,7 +79,7 @@ <target name="build.metro" depends="check.metro" unless="metro.build.exists"> <antcall target="checkout"/> - <antcall target="-install.adapter"/> + <antcall target="install.adapter"/> <antcall target="clean.metro"/> <antbridge target="copy-binaries" file="metro-build-adapter.xml"/> <echo>*********************************</echo> @@ -88,4 +88,4 @@ <touch file="glassfish-metro/metro.build.marker"/> </target> -</project> \ No newline at end of file +</project>

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5988 - stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-17 20:35:37 -0400 (Mon, 17 Mar 2008) New Revision: 5988 Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java Log: Fixing hudson regression Modified: stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java =================================================================== --- stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2008-03-17 18:09:35 UTC (rev 5987) +++ stack/native/trunk/src/test/java/org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.java 2008-03-18 00:35:37 UTC (rev 5988) @@ -48,7 +48,7 @@ SOAPFault soapFault = soapMessage.getSOAPBody().getFault(); String faultString = soapFault.getFaultString(); - if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.exception.UserException")) + if (!faultString.equals("Don't worry it's just a test") && !faultString.equals("org.jboss.test.ws.jaxrpc.samples.exception.UserException")) throw new JAXRPCException("Unexpected fault string: " + faultString); return true;

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5987 - in stack/native/trunk/src/main/java/org/jboss: wsf/stack/jbws and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-03-17 14:09:35 -0400 (Mon, 17 Mar 2008) New Revision: 5987 Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java Log: [JBWS-1941] Fixing exception handling + tck 5 failures Modified: stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2008-03-17 18:06:02 UTC (rev 5986) +++ stack/native/trunk/src/main/java/org/jboss/ws/core/server/ServiceEndpointInvoker.java 2008-03-17 18:09:35 UTC (rev 5987) @@ -63,7 +63,6 @@ import org.jboss.ws.core.soap.SOAPBodyImpl; import org.jboss.ws.core.soap.SOAPMessageImpl; import org.jboss.ws.extensions.wsrm.RMConstant; -import org.jboss.ws.extensions.wsrm.server.RMInvocationHandler; import org.jboss.ws.extensions.xop.XOPContext; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; @@ -223,7 +222,7 @@ } catch (InvocationTargetException th) { - // Unwrap the throwable raised by the service endpoint implementation + //Unwrap the throwable raised by the service endpoint implementation Throwable targetEx = th.getTargetException(); throw (targetEx instanceof Exception ? (Exception)targetEx : new UndeclaredThrowableException(targetEx)); } @@ -269,14 +268,14 @@ faultType[0] = null; } } - catch (RuntimeException ex) + catch (Exception ex) { // Reverse the message direction processPivotInternal(msgContext, direction); - + + CommonBinding binding = bindingProvider.getCommonBinding(); try { - CommonBinding binding = bindingProvider.getCommonBinding(); binding.bindFaultMessage(ex); // call the fault handler chain @@ -291,6 +290,7 @@ catch (RuntimeException subEx) { log.warn("Exception while processing handleFault: ", ex); + binding.bindFaultMessage(subEx); ex = subEx; } throw ex; Modified: stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java =================================================================== --- stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-17 18:06:02 UTC (rev 5986) +++ stack/native/trunk/src/main/java/org/jboss/wsf/stack/jbws/RequestHandlerImpl.java 2008-03-17 18:09:35 UTC (rev 5987) @@ -474,7 +474,7 @@ } catch (Exception ex) { - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction(); // In case we have an exception before the invoker is called // we create the fault message here. @@ -494,7 +494,7 @@ { try { - MessageAbstraction resMessage = msgContext.getMessageAbstraction(); + MessageAbstraction resMessage = MessageContextAssociation.peekMessageContext().getMessageAbstraction(); if (resMessage != null) { if (resMessage.isFaultMessage())

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5986 - in stack/metro/trunk: ant-import and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-03-17 14:06:02 -0400 (Mon, 17 Mar 2008) New Revision: 5986 Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml stack/metro/trunk/ant-import/build-metro.xml stack/metro/trunk/ant-import/build-prepare-deploy.xml stack/metro/trunk/ant-import/metro-build-adapter.xml stack/metro/trunk/build.xml stack/metro/trunk/metro-trunk.iml Log: Fix JBWS-1994: Explicit references to metro jars and assertions Modified: stack/metro/trunk/ant-import/build-metro.xml =================================================================== --- stack/metro/trunk/ant-import/build-metro.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/build-metro.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -60,7 +60,7 @@ <echo>**********************************</echo> </target> - <target name="-install.adapter" depends="init"> + <target name="install.adapter" depends="init"> <copy todir="${metro.repository.dir}" file="ant-import/metro-build-adapter.xml" overwrite="true" verbose="true"/> </target> Modified: stack/metro/trunk/ant-import/build-prepare-deploy.xml =================================================================== --- stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/build-prepare-deploy.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -37,14 +37,7 @@ <patternset refid="jbossws.lib.endorsed.patternset"/> <patternset refid="jbossws.server.lib.patternset"/> <patternset refid="jbossws.service.lib.patternset"/> - </fileset> - <fileset dir="glassfish-metro/output"> - <patternset refid="jbossws.client.patternset"/> - <patternset refid="jbossws.lib.patternset"/> - <patternset refid="jbossws.lib.endorsed.patternset"/> - <patternset refid="jbossws.server.lib.patternset"/> - <patternset refid="jbossws.service.lib.patternset"/> - </fileset> + </fileset> </copy> <copy todir="${deploy.artifacts.dir}/resources"> <fileset dir="${metro.output.resources.dir}"> Modified: stack/metro/trunk/ant-import/metro-build-adapter.xml =================================================================== --- stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import/metro-build-adapter.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -5,7 +5,7 @@ <import file="properties.xml"/> <import file="build.xml"/> - <property name="thirdparty.gen" value="../../output"/> + <property name="thirdparty.gen" value="../../../output/lib"/> <property name="thirdparty" value="../../../thirdparty"/> <target name="adapter.init"> @@ -51,10 +51,31 @@ <target name="copy-binaries" description="Builds the metro jars and copies them to glassfish-metro/output" - depends="metro.jars"> + depends="clean, metro.jars"> - <copy todir="${thirdparty.gen}" verbose="true"> +  + + <available property="jaxws-local-transport.available" filepath="${lib.runtime.dir}" file="jaxws-local-transport.jar"/> + <available property="stax-utils.available" filepath="${lib.runtime.dir}" file="stax-utils.jar"/> + <available property="txnannprocessor.available" filepath="${lib.runtime.dir}" file="txnannprocessor.jar"/> + <available property="wstx-asl-3.2.1.available" filepath="${lib.runtime.dir}" file="wstx-asl-3.2.1.jar"/> + <available property="xmldsig.available" filepath="${lib.runtime.dir}" file="xmldsig.jar"/> + <available property="xws-security.available" filepath="${lib.runtime.dir}" file="xws-security.jar"/> + <available property="resolver.available" filepath="${lib.runtime.dir}" file="resolver.jar"/> + + <fail message="jaxws-local-transport.jar not available" unless="jaxws-local-transport.available"/> + <fail message="stax-utils.jar not available" unless="stax-utils.available"/> + <fail message="txnannprocessor.jar not available" unless="txnannprocessor.available"/> + <fail message="wstx-asl-3.2.1.jar not available" unless="wstx-asl-3.2.1.available"/> + <fail message="xmldsig.jar not available" unless="xmldsig.available"/> + <fail message="xws-security.jar not available" unless="xws-security.available"/> + <fail message="resolver.jar not available" unless="resolver.available"/> + + <copy todir="${thirdparty.gen}" verbose="true" overwrite="true"> +  <fileset dir="${rt.dir}/build/"> <include name="jboss-wsit-rt.jar"/> Modified: stack/metro/trunk/ant-import-tests/build-testsuite.xml =================================================================== --- stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/ant-import-tests/build-testsuite.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -36,8 +36,8 @@ <pathelement location="${int.metro.dir}/thirdparty/jaxws-rt.jar"/> <pathelement location="${int.metro.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-tools.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/jboss-wsit-rt.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-tools.jar"/> + <pathelement location="${int.metro.dir}/output/lib/jboss-wsit-rt.jar"/> <pathelement location="${int.metro.dir}/thirdparty/mimepull.jar"/> <!--pathelement location="${int.metro.dir}/thirdparty/jsr173_api.jar"/> @@ -52,7 +52,7 @@ <pathelement location="${int.metro.dir}/thirdparty/wstx.jar"/> <pathelement location="${int.metro.dir}/thirdparty/wsdl4j.jar"/> - <pathelement location="${int.metro.dir}/glassfish-metro/output/xws-security.jar"/> + <pathelement location="${int.metro.dir}/output/lib/xws-security.jar"/> </path> <path id="tests.extra.classpath"> Modified: stack/metro/trunk/build.xml =================================================================== --- stack/metro/trunk/build.xml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/build.xml 2008-03-17 18:06:02 UTC (rev 5986) @@ -44,7 +44,7 @@ <property name="deploy.artifacts.dir" value="${metro.output.deploy.dir}-artifacts"/> <property name="deploy.structure.jboss42" value="${metro.output.deploy.dir}-jboss42"/> <property name="deploy.structure.jboss50" value="${metro.output.deploy.dir}-jboss50"/> - <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/> + <property name="jbossws.default.deploy.conf" value="${metro.dir}/ant-import/jbossws-default-deploy.conf"/> <import file="${basedir}/ant-import-tests/build-testsuite.xml"/> <import file="${basedir}/ant-import/build-metro.xml"/> Modified: stack/metro/trunk/metro-trunk.iml =================================================================== --- stack/metro/trunk/metro-trunk.iml 2008-03-17 14:40:05 UTC (rev 5985) +++ stack/metro/trunk/metro-trunk.iml 2008-03-17 18:06:02 UTC (rev 5986) @@ -265,15 +265,6 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/thirdparty/jaxws-tools.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> <root url="jar://$MODULE_DIR$/thirdparty/http.jar!/" /> </CLASSES> <JAVADOC />

16 years, 6 months

1
0
0 / 0

JBossWS SVN: r5985 - stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-03-17 10:40:05 -0400 (Mon, 17 Mar 2008) New Revision: 5985 Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java Log: [JBWS-2058] wsa:From header field is assigned to variable 'replyTo' instead of 'from' 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-03-15 17:38:05 UTC (rev 5984) +++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/addressing/soap/SOAPAddressingPropertiesImpl.java 2008-03-17 14:40:05 UTC (rev 5985) @@ -121,7 +121,7 @@ if (wsaFrom != null) { EndpointReferenceImpl ref = new EndpointReferenceImpl(wsaFrom); - setReplyTo(ref); + setFrom(ref); } // Read wsa:ReplyTo

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