January 2011 - jbossws-commits - Jboss List Archives

JBossWS SVN: r13545 - stack/cxf/trunk/src/main/scripts.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-05 06:37:13 -0500 (Wed, 05 Jan 2011) New Revision: 13545 Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Restore junit.jar in binary distro for compiling tests properly Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 17:54:23 UTC (rev 13544) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-05 11:37:13 UTC (rev 13545) @@ -148,6 +148,27 @@ </dependencySets> </binaries> </moduleSet> +  + <moduleSet> + <includes> + <include>org.jboss.ws.cxf:jbossws-cxf-transports-httpserver</include> + </includes> + <binaries> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <unpack>false</unpack> + <dependencySets> + <dependencySet> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>junit:junit:jar</include> + </includes> + <scope>test</scope> + </dependencySet> + </dependencySets> + </binaries> + </moduleSet> </moduleSets> <fileSets>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r13544 - stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 12:54:23 -0500 (Tue, 04 Jan 2011) New Revision: 13544 Modified: stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/Install.txt stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/ant.properties.example Log: Updating install instructions and ant.properties.example to guide users on installing 3.4.1 on top of JBoss AS 6 Final which is now released Modified: stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/Install.txt =================================================================== --- stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/Install.txt 2011-01-04 17:00:05 UTC (rev 13543) +++ stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/Install.txt 2011-01-04 17:54:23 UTC (rev 13544) @@ -11,12 +11,9 @@ 1.) Copy ant.properties.examples to ant.properties 2.) Modify the target container location in ant.properties -3.) Execute one of the following +3.) Execute - ant deploy-jboss501 - ant deploy-jboss510 ant deploy-jboss600 - ant deploy-jboss601 By default the SOAP stack will be installed to 'default' configuration. If users want to install SOAP stack to different JBossAS configuration then Modified: stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/ant.properties.example =================================================================== --- stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/ant.properties.example 2011-01-04 17:00:05 UTC (rev 13543) +++ stack/native/tags/jbossws-native-3.4.1.GA/src/main/distro/ant.properties.example 2011-01-04 17:54:23 UTC (rev 13544) @@ -3,13 +3,9 @@ # # Optional JBoss Home -jboss501.home=(a)jboss501.home@ -jboss510.home=(a)jboss510.home@ -jboss600.home=(a)jboss600.home@ -jboss601.home=(a)jboss601.home@ +jboss600.home=(a)jboss601.home@ -# The JBoss server under test. This can be [jboss501|jboss510|jboss600jboss601|] -jbossws.integration.target=jboss510 +jbossws.integration.target=jboss600 # The JBoss settings jboss.server.instance=default

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r13543 - in stack/native/trunk: modules/core and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 12:00:05 -0500 (Tue, 04 Jan 2011) New Revision: 13543 Removed: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml stack/native/trunk/modules/management/pom.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/pom.xml stack/native/trunk/profiles.xml.example stack/native/trunk/src/main/distro/Install.txt stack/native/trunk/src/main/distro/ant.properties.example stack/native/trunk/src/main/distro/build-deploy.xml stack/native/trunk/src/main/distro/build-setup.xml stack/native/trunk/src/main/distro/build.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Updating to JBoss AS 6 Final and removing some AS 5.x stuff Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/core/pom.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -196,6 +196,9 @@ </artifactItems> </configuration> </execution> +  +  +  -  -  -  </artifactItems> </configuration> </execution> + --> +  </executions> </plugin>  Deleted: stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml =================================================================== --- stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/core/src/main/resources/jbossws-native-config-as5.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -1,94 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <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> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - -  - <bean name="WSNativeContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties, StackDescriptor</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class</key> - <value>org.jboss.wsf.stack.jbws.EndpointServlet</value> - </entry> - </map> - </property> - <property name="relativeOrder">31</property>  - </bean> - - <bean name="WSNativeEagerInitializeDeploymentAspect" class="org.jboss.wsf.stack.jbws.EagerInitializeDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="provides">InitializedMetaDataModel</property> - <property name="relativeOrder">25</property>  - </bean> - - <bean name="WSNativeEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="relativeOrder">13</property>  - </bean> - - <bean name="WSNativeEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - <property name="relativeOrder">36</property>  - </bean> - - <bean name="WSNativeEventingDeploymentAspect" class="org.jboss.wsf.stack.jbws.EventingDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="relativeOrder">26</property>  - </bean> - - <bean name="WSNativePublishContractDeploymentAspect" class="org.jboss.wsf.stack.jbws.PublishContractDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel, JAXBIntros</property> - <property name="provides">PublishedContract</property> - <property name="relativeOrder">24</property>  - </bean> - - <bean name="WSNativeServiceEndpointInvokerDeploymentAspect" class="org.jboss.wsf.stack.jbws.ServiceEndpointInvokerDeploymentAspect"> - <property name="requires">UnifiedMetaDataModel</property> - <property name="relativeOrder">23</property>  - </bean> - - <bean name="WSNativeRMDeploymentAspect" class="org.jboss.ws.extensions.wsrm.server.RMDeploymentAspect"> - <property name="requires">StackEndpointHandler, UnifiedMetaDataModel</property> - <property name="relativeOrder">27</property>  - </bean> - - <bean name="WSNativeUnifiedMetaDataDeploymentAspect" class="org.jboss.wsf.stack.jbws.UnifiedMetaDataDeploymentAspect"> - <property name="requires">ContainerMetaData, URLPattern, VFSRoot, JAXBIntros</property> - <property name="provides">UnifiedMetaDataModel</property> - <property name="relativeOrder">22</property>  - </bean> - - <bean name="WSJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - <property name="relativeOrder">21</property>  - </bean> - -</deployment> Modified: stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/core/src/main/scripts/antrun-beans-config.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -17,16 +17,6 @@ <target name="main"> <copy - file="${src.dir}/jbossws-native-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-native-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy file="${src.dir}/jbossws-native-config-as6.xml" tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> Modified: stack/native/trunk/modules/management/pom.xml =================================================================== --- stack/native/trunk/modules/management/pom.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/management/pom.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -29,36 +29,11 @@ <scope>provided</scope> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <scope>provided</scope> - </dependency>    - <profile> - <id>jboss501</id> - <properties> - <jboss.version>5.0.1.GA</jboss.version> - <jbossws.integration.target>jboss501</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> -  - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss510</id> - <properties> - <jboss.version>5.1.0.GA</jboss.version> - <jbossws.integration.target>jboss510</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> -  - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20101110-CR1</jboss.version> + <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -562,7 +447,7 @@ <profile> <id>jboss601</id> <properties> - <jboss.version>6.0.0-SNAPSHOT</jboss.version> + <jboss.version>6.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss601</jbossws.integration.target> </properties> <dependencies> Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 17:00:05 UTC (rev 13543) @@ -1,21 +0,0 @@ -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/** -org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml -org/jboss/test/ws/jaxws/jbws3140/** - -# [JBWS-3150] This test causes hudson to freeze -org/jboss/test/ws/common/soap/SOAPConnectionTestCase.* Deleted: stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 17:00:05 UTC (rev 13543) @@ -1,21 +0,0 @@ -# UsernameTokenHTTPSTestCase requires keystore & trustore in jboss-web tomcat configuration -org/jboss/test/ws/interop/nov2007/wsse/UsernameTokenHTTPSTestCase.* - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/** -org/jboss/test/ws/jaxws/epr/NativeEndpointReferenceTestCase.* - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml -org/jboss/test/ws/jaxws/jbws3140/** - -# [JBWS-3150] This test causes hudson to freeze -org/jboss/test/ws/common/soap/SOAPConnectionTestCase.* Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/pom.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -49,12 +49,9 @@ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version> - <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version> - <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>     @@ -108,57 +105,11 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency>    - <profile> - <id>jboss501</id> - <properties> - <jbossws.integration.target>jboss501</jbossws.integration.target> - <jboss.home>${jboss501.home}</jboss.home> - </properties> - </profile> - -  - <profile> - <id>jboss510</id> - <properties> - <jbossws.integration.target>jboss510</jbossws.integration.target> - <jboss.home>${jboss510.home}</jboss.home> - </properties> - </profile> - -  Modified: stack/native/trunk/profiles.xml.example =================================================================== --- stack/native/trunk/profiles.xml.example 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/profiles.xml.example 2011-01-04 17:00:05 UTC (rev 13543) @@ -11,10 +11,8 @@ </property> </activation> <properties> - <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> - <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20101110-CR1/build/target/jboss-6.0.0.20101110-CR1</jboss600.home> - <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final</jboss600.home> + <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/native/trunk/src/main/distro/Install.txt =================================================================== --- stack/native/trunk/src/main/distro/Install.txt 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/distro/Install.txt 2011-01-04 17:00:05 UTC (rev 13543) @@ -13,8 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss501 - ant deploy-jboss510 ant deploy-jboss600 ant deploy-jboss601 Modified: stack/native/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/native/trunk/src/main/distro/ant.properties.example 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/distro/ant.properties.example 2011-01-04 17:00:05 UTC (rev 13543) @@ -3,13 +3,11 @@ # # Optional JBoss Home -jboss501.home=(a)jboss501.home@ -jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ -# The JBoss server under test. This can be [jboss501|jboss510|jboss600jboss601|] -jbossws.integration.target=jboss510 +# The JBoss server under test. This can be [jboss600jboss601|] +jbossws.integration.target=jboss601 # The JBoss settings jboss.server.instance=default Modified: stack/native/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/src/main/distro/build-deploy.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/distro/build-deploy.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -12,88 +12,6 @@ <project>  -  -  - - <target name="deploy-structure-jboss50" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - -  -  -  - - <target name="target-jboss501"> - <property name="jbossws.integration.target" value="jboss501"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50" description="Deploy jbossws to jboss501"> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <copy todir="${jboss501.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true"/> - </target> - -  -  -  - - <target name="deploy-structure-jboss51" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-native" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - </target> - -  -  -  - - <target name="target-jboss510"> - <property name="jbossws.integration.target" value="jboss510"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51" description="Deploy jbossws to jboss510"> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <copy todir="${jboss510.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws targetdir="${jboss510.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true"/> - </target> - -    Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/distro/build-setup.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -21,20 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss510.lib" value="${jboss510.home}/lib"/> - <property name="jboss510.client" value="${jboss510.home}/client"/> - <property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/> - <property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/> - <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> - <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> - <property name="jboss600.lib" value="${jboss600.home}/lib"/> <property name="jboss600.client" value="${jboss600.home}/client"/> <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> @@ -49,13 +35,9 @@ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/> <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - <available property="jboss510.available" file="${jboss510.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss601.available" file="${jboss601.available.file}"/> Modified: stack/native/trunk/src/main/distro/build.xml =================================================================== --- stack/native/trunk/src/main/distro/build.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/distro/build.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -46,16 +46,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - <condition property="jbossws.integration.jboss51" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> - </or> - </condition> <condition property="jbossws.integration.jboss60" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 15:57:09 UTC (rev 13542) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 17:00:05 UTC (rev 13543) @@ -132,61 +132,11 @@ <include>juddi:juddi:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> - </includes> - </dependencySet>   <!-- <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss600M5:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope>

13 years, 11 months

1
0
0 / 0

JBossWS SVN: r13542 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2937.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 10:57:09 -0500 (Tue, 04 Jan 2011) New Revision: 13542 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java Log: Removing System.out.println from test Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2011-01-04 15:38:17 UTC (rev 13541) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java 2011-01-04 15:57:09 UTC (rev 13542) @@ -40,6 +40,7 @@ import junit.framework.Test; +import org.jboss.logging.Logger; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestSetup; @@ -167,7 +168,7 @@ private void verifyResponse(final Source result) throws Exception { final Element echoResponseElement = DOMUtils.sourceToElement(result); - System.out.println(DOMUtils.node2String(echoResponseElement)); + Logger.getLogger(this.getClass()).info(DOMUtils.node2String(echoResponseElement)); assertNotNull("echoResponse element is null", echoResponseElement); // validate return element final Element returnElement = DOMUtils.getFirstChildElement(echoResponseElement);

13 years, 12 months

1
0
0 / 0

JBossWS SVN: r13541 - stack/cxf/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 10:38:17 -0500 (Tue, 04 Jan 2011) New Revision: 13541 Modified: stack/cxf/trunk/profiles.xml.example Log: Fixing profiles.xml.example file Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2011-01-04 14:25:05 UTC (rev 13540) +++ stack/cxf/trunk/profiles.xml.example 2011-01-04 15:38:17 UTC (rev 13541) @@ -11,7 +11,7 @@ </property> </activation> <properties> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final/jboss600.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final</jboss600.home> <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home> </properties> </profile>

13 years, 12 months

1
0
0 / 0

JBossWS SVN: r13540 - in stack/cxf/trunk: modules/management and 6 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 09:25:05 -0500 (Tue, 04 Jan 2011) New Revision: 13540 Removed: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt Modified: stack/cxf/trunk/build.xml stack/cxf/trunk/modules/management/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/profiles.xml.example stack/cxf/trunk/src/main/distro/Install.txt stack/cxf/trunk/src/main/distro/ant.properties.example stack/cxf/trunk/src/main/distro/build-deploy.xml stack/cxf/trunk/src/main/distro/build-setup.xml stack/cxf/trunk/src/main/distro/build.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Updating to JBoss AS 6 Final and removing AS 5.x stuff Modified: stack/cxf/trunk/build.xml =================================================================== --- stack/cxf/trunk/build.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/build.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -56,12 +56,6 @@ <arg line="${maven.opts} help:effective-settings"/> </exec> <xmlproperty file="${stack.output.dir}/effective-settings.xml" keeproot="false"/> - <condition property="jboss501.home" value="${profiles.profile.properties.jboss501.home}"> - <isset property="profiles.profile.properties.jboss501.home"/> - </condition> - <condition property="jboss510.home" value="${profiles.profile.properties.jboss510.home}"> - <isset property="profiles.profile.properties.jboss510.home"/> - </condition> <condition property="jboss600.home" value="${profiles.profile.properties.jboss600.home}"> <isset property="profiles.profile.properties.jboss600.home"/> </condition> @@ -71,14 +65,10 @@  <xmlproperty file="${basedir}/profiles.xml" keeproot="false"/> - <property name="jboss501.home" value="${profiles.profile.properties.jboss501.home}"/> - <property name="jboss510.home" value="${profiles.profile.properties.jboss510.home}"/> <property name="jboss600.home" value="${profiles.profile.properties.jboss600.home}"/> <property name="jboss601.home" value="${profiles.profile.properties.jboss601.home}"/> <echo/> - <echo message="jboss501.home=${jboss501.home}"/> - <echo message="jboss510.home=${jboss510.home}"/> <echo message="jboss600.home=${jboss600.home}"/> <echo message="jboss601.home=${jboss601.home}"/> </target> Modified: stack/cxf/trunk/modules/management/pom.xml =================================================================== --- stack/cxf/trunk/modules/management/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/management/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -29,46 +29,6 @@ <scope>provided</scope> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <scope>provided</scope> - </dependency>    +  +  -  -  -  </artifactItems> </configuration> </execution> </executions> </plugin> + --> +   <plugin> <artifactId>maven-antrun-plugin</artifactId> Deleted: stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/server/src/main/resources/jbossws-cxf-config-as5.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,88 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<deployment xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="CXFInitializer" class="org.jboss.wsf.stack.cxf.config.CXFInitializer" /> - -  - <bean name="WSEndpointRegistry" class="org.jboss.wsf.framework.management.ManagedEndpointRegistry"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - </bean> - -  - <bean name="JDKLogRedirector" class="org.jboss.wsf.common.logging.JDKLogRedirector"> - <property name="namespaces"> - <list class="java.util.LinkedList" elementClass="java.lang.String"> - <value>org.apache.cxf</value> - </list> - </property> - </bean> - -  - <bean name="WSMemoryBufferRecorder" class="org.jboss.wsf.framework.management.recording.MemoryBufferRecorder"> - <property name="recording">false</property> - </bean> - <bean name="WSLogRecorder" class="org.jboss.wsf.framework.management.recording.LogRecorder"> - <property name="recording">false</property> - </bean> - -  - <bean name="WSCXFContextPropertiesDeploymentAspect" class="org.jboss.wsf.framework.deployment.ContextPropertiesDeploymentAspect"> - <property name="provides">ContextProperties</property> - <property name="contextProperties"> - <map keyClass="java.lang.String" valueClass="java.lang.String"> - <entry> - <key>stack.transport.class.provider</key> - <value>org.jboss.wsf.stack.cxf.deployment.CXFServletClassProvider</value> - </entry> - </map> - </property> - <property name="relativeOrder">31</property>  - </bean> - - <bean name="WSCXFDescriptorDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.DescriptorDeploymentAspect"> - <property name="requires">EndpointAddress,JAXBIntros</property> - <property name="provides">StackDescriptor</property> - <property name="invokerEJB3">org.jboss.wsf.stack.cxf.InvokerEJB3</property> - <property name="invokerJSE">org.jboss.wsf.stack.cxf.InvokerJSE</property> - <property name="relativeOrder">21</property>  - </bean> - - <bean name="WSCXFResourceResolverDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.ResourceResolverDeploymentAspect"> - <property name="requires">JmsEndpointAddress</property> - <property name="provides">ResourceResolver</property> - <property name="relativeOrder">23</property>  - </bean> - - <bean name="WSCXFEndpointHandlerDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointHandlerDeploymentAspect"> - <property name="requires">ContainerMetaData</property> - <property name="provides">StackEndpointHandler</property> - <property name="relativeOrder">13</property>  - </bean> - - <bean name="WSCXFEndpointRecordProcessorDeploymentAspect" class="org.jboss.wsf.framework.deployment.EndpointRecordProcessorDeploymentAspect"> - <property name="mbeanServer"><inject bean="WSMBeanServerLocator" property="mbeanServer"/></property> - <property name="requires">RegisteredEndpoint</property> - <property name="provides">EndpointRecordProcessors</property> - <property name="relativeOrder">36</property>  - <property name="processors"> - <list class="java.util.ArrayList" elementClass="org.jboss.wsf.spi.management.recording.RecordProcessor"> - <inject bean="WSMemoryBufferRecorder"/> - <inject bean="WSLogRecorder"/> - </list> - </property> - </bean> - - <bean name="WSCXFJAXBIntroDeploymentAspect" class="org.jboss.wsf.framework.deployment.JAXBIntroDeploymentAspect"> - <property name="provides">JAXBIntros</property> - <property name="relativeOrder">20</property>  - </bean> - - <bean name="WSCXFBusDeploymentAspect" class="org.jboss.wsf.stack.cxf.deployment.aspect.BusDeploymentAspect"> - <property name="provides">BusHolder</property> - <property name="requires">ResourceResolver,StackDescriptor</property> - <property name="relativeOrder">24</property>  - </bean> - -</deployment> Modified: stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml =================================================================== --- stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/server/src/main/scripts/antrun-beans-config.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -17,16 +17,6 @@ <target name="main"> <copy - file="${src.dir}/jbossws-cxf-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss501/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy - file="${src.dir}/jbossws-cxf-config-as5.xml" - tofile="${dest.dir}/jbossws-jboss510/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" - /> - - <copy file="${src.dir}/jbossws-cxf-config-as6.xml" tofile="${dest.dir}/jbossws-jboss600/jbossws.beans/META-INF/stack-specific-jboss-beans.xml" /> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -366,161 +366,13 @@ </profile>  - <profile> - <id>jboss501</id> - <properties> - <jboss.version>5.0.1.GA</jboss.version> - <jbossws.integration.target>jboss501</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>org.jboss.security</groupId> - <artifactId>jbosssx</artifactId> - </exclusion> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>${jboss.javaee.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> -  - <testExcludeFile>../test-excludes-jboss501.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss501.home}/lib/endorsed</argLine> -  - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> -  - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  - <profile> - <id>jboss510</id> - <properties> - <jboss.version>5.1.0.GA</jboss.version> - <jbossws.integration.target>jboss510</jbossws.integration.target> - </properties> - <dependencies> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>${hibernate.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-ejb3</artifactId> - <version>${jboss.version}</version> - <exclusions> - <exclusion> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxws</groupId> - <artifactId>jaxws-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.jbossas</groupId> - <artifactId>jboss-as-security</artifactId> - <version>${jboss.version}</version> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - - <configuration> -  - <testExcludeFile>../test-excludes-jboss510.txt</testExcludeFile> - <compilerArgument>-Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</compilerArgument> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <argLine>${surefire.jvm.args} ${surefire.jvm.management.args} -Djava.endorsed.dirs=${jboss510.home}/lib/endorsed</argLine> -  - <additionalClasspathElements> - <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> -  - <additionalClasspathElement>${jboss.home}/common/lib/jbossws-native-core.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/common/lib/netty.jar</additionalClasspathElement> - </additionalClasspathElements> - </configuration> - </plugin> - </plugins> - </build> - </profile> - -  <profile> <id>jboss600</id> <properties> - <jboss.version>6.0.0.20101110-CR1</jboss.version> + <jboss.version>6.0.0.Final</jboss.version> <jbossws.integration.target>jboss600</jbossws.integration.target> </properties> <dependencies> @@ -647,7 +499,7 @@ <profile> <id>jboss601</id> <properties> - <jboss.version>6.0.0-SNAPSHOT</jboss.version> + <jboss.version>6.0.1-SNAPSHOT</jboss.version> <jbossws.integration.target>jboss601</jbossws.integration.target> </properties> <dependencies> Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss501.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,50 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - -# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* - -# [JBWS-2987] Review JMS integration -org/jboss/test/ws/jaxws/samples/jmstransport/** - -# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* - -# [JBWS-3086] This have been merged to AS 600M3 and upstream only -org/jboss/test/ws/jaxws/samples/jmsendpoints/** - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS501 -org/jboss/test/ws/jaxws/jbws3140/** - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** \ No newline at end of file Deleted: stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt =================================================================== --- stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/modules/testsuite/test-excludes-jboss510.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -1,50 +0,0 @@ -# UsernameTestCase requires trustore in jboss-web tomcat configuration -org/jboss/test/ws/jaxws/samples/wssePolicy/UsernameTestCase.* - -# [CXF-1519] Explicitly set the namespace of a WebFault -org/jboss/test/ws/jaxws/jbws1904/** - -# [CXF-2006] RespectBinding feature and not understood required extensibility elements -org/jboss/test/ws/jaxws/jbws2449/** - -# [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored -org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* - -# [JBWS-2561] XOP request not properly inlined -org/jboss/test/ws/jaxws/samples/xop/doclit/XOPHandlerTestCase.* - -# [JBWS-2480] Soap attachments are dropped on server response -org/jboss/test/ws/jaxws/jbws1283/** - -# [JBWS-2397] Fix jbws1797 testcase -org/jboss/test/ws/jaxws/jbws1797/** - -# [JBWS-2917] We're using buggy xalan version causing namespaces issues -org/jboss/test/ws/jaxws/jbws2917/** -org/jboss/test/ws/jaxws/jbws2937/** -org/jboss/test/ws/jaxws/jbws2942/** -org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.* - -# [JBWS-2895] JAX-RPC available from AS 6.0.0.M3 -org/jboss/test/ws/jaxrpc/** - -# [JBWS-2945] JAX-WS 2.2 implementation not yet available for CXF stack -org/jboss/test/ws/jaxws/samples/addressing/AddressingStatefulTestCase.* - -# [JBWS-2987] Review JMS integration -org/jboss/test/ws/jaxws/samples/jmstransport/** - -# [JBWS-3028] Complete UsernameToken JAAS integration: PicketBox not available on AS 5.x -org/jboss/test/ws/jaxws/samples/wsse/UsernameAuthorizationCustomFileTestCase.* - -# [JBWS-3086] This have been merged to AS 600M3 and upstream only -org/jboss/test/ws/jaxws/samples/jmsendpoints/** - -# [JBWS-2957] EJB3 webservices in web archives (fixed on AS 6 series only) -org/jboss/test/ws/jaxws/jbws2957/** - -# [JBWS-3140] mtom, wsaddressing support in webservices.xml; jboss-metadata-common doesn't support this metadata by in AS510 -org/jboss/test/ws/jaxws/jbws3140/** - -# Seems MSFT interop. endpoints are down :( -org/jboss/test/ws/jaxws/cxf/interop/wstrust10/** Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/pom.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -49,12 +49,9 @@ <jbossws.spi.version>2.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.common.version>2.0.0-SNAPSHOT</jbossws.common.version> <jbossws.framework.version>4.0.0-SNAPSHOT</jbossws.framework.version> - <jbossws.jboss501.version>3.4.1-SNAPSHOT</jbossws.jboss501.version> - <jbossws.jboss510.version>3.4.1-SNAPSHOT</jbossws.jboss510.version>     @@ -120,57 +117,11 @@ <classifier>testsuite</classifier> <type>zip</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501-metadata</artifactId> - <version>${jbossws.jboss501.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss501</artifactId> - <version>${jbossws.jboss501.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510-metadata</artifactId> - <version>${jbossws.jboss510.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss510</artifactId> - <version>${jbossws.jboss510.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency>    - <profile> - <id>jboss501</id> - <properties> - <jbossws.integration.target>jboss501</jbossws.integration.target> - <jboss.home>${jboss501.home}</jboss.home> - </properties> - </profile> - -  - <profile> - <id>jboss510</id> - <properties> - <jbossws.integration.target>jboss510</jbossws.integration.target> - <jboss.home>${jboss510.home}</jboss.home> - </properties> - </profile> - -  Modified: stack/cxf/trunk/profiles.xml.example =================================================================== --- stack/cxf/trunk/profiles.xml.example 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/profiles.xml.example 2011-01-04 14:25:05 UTC (rev 13540) @@ -11,10 +11,8 @@ </property> </activation> <properties> - <jboss501.home>/home/opalka/svn/jbossas/tags/JBoss_5_0_1_GA/build/output/jboss-5.0.1.GA</jboss501.home> - <jboss510.home>/home/opalka/svn/jbossas/tags/JBoss_5_1_0_GA/build/output/jboss-5.1.0.GA</jboss510.home> - <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.20101110-CR1/build/target/jboss-6.0.0.20101110-CR1</jboss600.home> - <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.0-SNAPSHOT</jboss601.home> + <jboss600.home>/home/opalka/svn/jbossas/tags/6.0.0.Final/build/target/jboss-6.0.0.Final/jboss600.home> + <jboss601.home>/home/opalka/svn/jbossas/trunk/build/output/jboss-6.0.1-SNAPSHOT</jboss601.home> </properties> </profile> Modified: stack/cxf/trunk/src/main/distro/Install.txt =================================================================== --- stack/cxf/trunk/src/main/distro/Install.txt 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/Install.txt 2011-01-04 14:25:05 UTC (rev 13540) @@ -13,8 +13,6 @@ 2.) Modify the target container location in ant.properties 3.) Execute one of the following - ant deploy-jboss501 - ant deploy-jboss510 ant deploy-jboss600 ant deploy-jboss601 Modified: stack/cxf/trunk/src/main/distro/ant.properties.example =================================================================== --- stack/cxf/trunk/src/main/distro/ant.properties.example 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/ant.properties.example 2011-01-04 14:25:05 UTC (rev 13540) @@ -3,13 +3,11 @@ # # Optional JBoss Home -jboss501.home=(a)jboss501.home@ -jboss510.home=(a)jboss510.home@ jboss600.home=(a)jboss600.home@ jboss601.home=(a)jboss601.home@ -# The JBoss server under test. This can be [jboss501|jboss510|jboss600|jboss601] -jbossws.integration.target=jboss510 +# The JBoss server under test. This can be [jboss600|jboss601] +jbossws.integration.target=jboss601 # The JBoss settings jboss.server.instance=default Modified: stack/cxf/trunk/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build-deploy.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -12,90 +12,6 @@ <project>  -  -  - - <target name="deploy-structure-jboss50" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - </target> - -  -  -  - - <target name="target-jboss501"> - <property name="jbossws.integration.target" value="jboss501"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss501" depends="undeploy-jboss501,deploy-structure-jboss50,check-spring,install-spring" description="Deploy jbossws to jboss501"> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <copy todir="${jboss501.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss501.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss501" depends="target-jboss501,init" description="Remove jbossws from jboss501"> - <fail message="Not available: ${jboss501.available.file}" unless="jboss501.available"/> - <macro-undeploy-jbossws targetdir="${jboss501.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="true"/> - </target> - -  -  -  - - <target name="deploy-structure-jboss51" depends="prepare-deploy"> - <delete dir="${deploy.structure}"/> - <antcall target="deploy-jbossws-cxf" inheritall="false"> - <param name="installserver" value="${deploy.structure}/server/${jboss.server.instance}"/> - <param name="jbossid" value="${jbossws.integration.target}"/> - <param name="artifactsdir" value="${deploy.artifacts.dir}"/> - <param name="thirdpartydir" value="${deploy.artifacts.dir}"/> - <param name="modifyjbossintegration" value="true"/> - </antcall> - </target> - -  -  -  - - <target name="target-jboss510"> - <property name="jbossws.integration.target" value="jboss510"/> - <echo message="jbossws.integration.target=${jbossws.integration.target}" file="${target.properties.file}"/> - </target> - - <target name="deploy-jboss510" depends="undeploy-jboss510,deploy-structure-jboss51,check-spring,install-spring" description="Deploy jbossws to jboss510"> - <macro-create-deploy-conf deploystructure="${deploy.structure}"/> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <copy todir="${jboss510.home}" overwrite="true" verbose="true"> - <fileset dir="${deploy.structure}"/> - </copy> - <chmod dir="${jboss510.home}/bin" perm="+x" includes="*.sh"/> - </target> - - <target name="undeploy-jboss510" depends="target-jboss510,init" description="Remove jbossws from jboss510"> - <fail message="Not available: ${jboss510.available.file}" unless="jboss510.available"/> - <macro-undeploy-jbossws targetdir="${jboss510.server}" - defaultconf="${jbossws.default.deploy.conf}" - defaultserverconf="${jbossws.default.server.deploy.conf}" - modifyjbossintegration="true" - removenativecore="true"/> - </target> - -    Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -21,20 +21,6 @@ <property file="${target.properties.file}"/> <property name="jboss.server.instance" value="default"/> - <property name="jboss501.lib" value="${jboss501.home}/lib"/> - <property name="jboss501.client" value="${jboss501.home}/client"/> - <property name="jboss501.server" value="${jboss501.home}/server/${jboss.server.instance}"/> - <property name="jboss501.server.lib" value="${jboss501.home}/common/lib"/> - <property name="jboss501.server.deploy" value="${jboss501.server}/deploy"/> - <property name="jboss501.server.deployers" value="${jboss501.server}/deployers"/> - - <property name="jboss510.lib" value="${jboss510.home}/lib"/> - <property name="jboss510.client" value="${jboss510.home}/client"/> - <property name="jboss510.server" value="${jboss510.home}/server/${jboss.server.instance}"/> - <property name="jboss510.server.lib" value="${jboss510.home}/common/lib"/> - <property name="jboss510.server.deploy" value="${jboss510.server}/deploy"/> - <property name="jboss510.server.deployers" value="${jboss510.server}/deployers"/> - <property name="jboss600.lib" value="${jboss600.home}/lib"/> <property name="jboss600.client" value="${jboss600.home}/client"/> <property name="jboss600.server" value="${jboss600.home}/server/${jboss.server.instance}"/> @@ -49,13 +35,9 @@ <property name="jboss601.server.deploy" value="${jboss601.server}/deploy"/> <property name="jboss601.server.deployers" value="${jboss601.server}/deployers"/> - <property name="jboss501.available.file" value="${jboss501.client}/jboss-client.jar"/> - <property name="jboss510.available.file" value="${jboss510.client}/jboss-client.jar"/> <property name="jboss600.available.file" value="${jboss600.client}/jboss-client.jar"/> <property name="jboss601.available.file" value="${jboss601.client}/jboss-client.jar"/> - <available property="jboss501.available" file="${jboss501.available.file}"/> - <available property="jboss510.available" file="${jboss510.available.file}"/> <available property="jboss600.available" file="${jboss600.available.file}"/> <available property="jboss601.available" file="${jboss601.available.file}"/> Modified: stack/cxf/trunk/src/main/distro/build.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/distro/build.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -46,16 +46,6 @@ <fail message="jbossws.integration.target not set" unless="jbossws.integration.target"/> <echo message="integration.target=${jbossws.integration.target}"/> - <condition property="jbossws.integration.jboss50" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss501"/> - </or> - </condition> - <condition property="jbossws.integration.jboss51" value="true"> - <or> - <equals arg1="${jbossws.integration.target}" arg2="jboss510"/> - </or> - </condition> <condition property="jbossws.integration.jboss60" value="true"> <or> <equals arg1="${jbossws.integration.target}" arg2="jboss600"/> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 09:24:53 UTC (rev 13539) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2011-01-04 14:25:05 UTC (rev 13540) @@ -130,61 +130,11 @@ <include>juddi:juddi:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss501-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss501-metadata:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss510-metadata.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss510-metadata:jar</include> - </includes> - </dependencySet>   <!-- <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> - <outputFileNameMapping>jbossws-jboss600.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - <includes> - <include>org.jboss.ws:jbossws-jboss600M5:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>deploy-artifacts/lib</outputDirectory> <outputFileNameMapping>jbossws-jboss601.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope>

13 years, 12 months

1
0
0 / 0

JBossWS SVN: r13539 - in framework/trunk/hudson: hudson-home/jobs and 19 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2011-01-04 04:24:53 -0500 (Tue, 04 Jan 2011) New Revision: 13539 Added: framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/ framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml Modified: framework/trunk/hudson/ant.properties.example framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml Log: Initial update to hudson configuration after AS 6.0.0.Final release Modified: framework/trunk/hudson/ant.properties.example =================================================================== --- framework/trunk/hudson/ant.properties.example 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/ant.properties.example 2011-01-04 09:24:53 UTC (rev 13539) @@ -24,10 +24,14 @@ hudson.native.url=http://anonsvn.jboss.org/repos/jbossws/stack/native/trunk hudson.cxf.url=http://anonsvn.jboss.org/repos/jbossws/stack/cxf/trunk -hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/trunk -hudson.jboss600.build=jboss-6.0.0-SNAPSHOT +hudson.jboss600.url=http://anonsvn.jboss.org/repos/jbossas/tags/6.0.0.Final +hudson.jboss600.build=jboss-6.0.0.Final hudson.jboss600.rev=HEAD +hudson.jboss601.url=http://anonsvn.jboss.org/repos/jbossas/trunk +hudson.jboss601.build=jboss-6.0.1-SNAPSHOT +hudson.jboss601.rev=HEAD + hudson.mail.recipients= hudson.smtp.host=localhost Added: framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/AS-6.0.1/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,70 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +SVNBASE=JBossAS-6.0.1 + +# +# checkout with an explicit version +# +#if [ -d "$SVNBASE" ]; then +# svn up -r(a)hudson.jboss601.rev@ $SVNBASE +#else +# svn co -r(a)hudson.jboss601.rev@ @hudson.jboss600.url@ +#fi + +# +# build jboss +# +cd $SVNBASE +./build.sh clean +./build.sh -Dskip-download-sources + +# +# Verify build +# +if [ ! -d ./build/target/(a)hudson.jboss601.build@ ]; then + echo "Cannot find expected build: @hudson.jboss601.build@" + exit 1 +fi + </command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.jboss601.url@</remote> + <local>JBossAS-6.0.1</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossAS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build AS-6.0.1</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/AS-ALL/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-6.0.0</childProjects> + <childProjects>AS-6.0.0, AS-6.0.1</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Modified: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-ALL/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>AS-TESTS-AS-6.0.0</childProjects> + <childProjects>AS-TESTS-AS-6.0.0, AS-TESTS-AS-6.0.1</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Added: framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/AS-TESTS-AS-6.0.1/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,125 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=AS-TESTS-AS-6.0.1 + +WORKSPACE=`pwd` +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +rm -rf $WORKSPACE/jboss-copy +cp -r $JBOSS_INSTANCE $WORKSPACE/jboss-copy +export JBOSS_HOME=$JBOSS_INSTANCE + +ENVIRONMENT="-Dmaven.opts=-U -Djboss.bind.address=(a)jboss.bind.address@ -Djbossws.integration.target=$JBOSS_TARGET -Djboss601.home=$JBOSS_HOME" + +# +# stop jbossas +# +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop + +# +# build and deploy +# +cd $STACK_DIR +cp profiles.xml.example profiles.xml +mvn -Ptestsuite clean +ant $ENVIRONMENT deploy-jboss601 + +# remove obsolete logs +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log +rm -f $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + +# +# start jbossas +# +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BIND_ADDRESS + +# Was it successfully started? +$HUDSON_DIR/jboss/bin/http-spider.sh $JBOSS_BIND_ADDRESS:8080 $WORKSPACE +if [ -e $WORKSPACE/spider.failed ]; then + tail -n 100 $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log + $HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BIND_ADDRESS + exit 1 +fi + +# +# build the testsuite +# +cd $JBOSS_HOME/../../../testsuite +./build.sh -Dnode0=$JBOSS_BIND_ADDRESS clean main + +# +# execute tests +# +./build.sh -Dnode0=$JBOSS_BIND_ADDRESS init tests-webservice tests-ws tests-report 2>&1 | tee $WORKSPACE/tests.log +cat $WORKSPACE/tests.log | egrep FIXME\|FAILED | sort -u | tee $WORKSPACE/fixme.txt +cat $STACK_DIR/modules/testsuite/test-excludes-$JBOSS_TARGET.txt $WORKSPACE/fixme.txt | egrep "\[\S*]" > $WORKSPACE/errata-$JBOSS_TARGET.txt + +# +# copy the test reports +# +rm -rf $WORKSPACE/test-reports +mkdir $WORKSPACE/test-reports +cp -r ./output/reports/*.xml $WORKSPACE/test-reports + +# +# stop jbossas +# +$HUDSON_DIR/jboss/bin/jboss.sh $JBOSS_HOME stop +cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/boot.log $WORKSPACE/jboss-boot.log +cp $JBOSS_HOME/server/@jboss.server.instance(a)/log/server.log $WORKSPACE/jboss-server.log +rm -rf $JBOSS_HOME +mv $WORKSPACE/jboss-copy $JBOSS_HOME +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Run the AS-6.0.1 webservice testsuite agains jbossws-(a)version.id@</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/CXF-ALL/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -15,6 +15,18 @@ , CXF-SRCDIST-AS-6.0.0-SUN-JDK-6 , CXF-SRCDIST-AS-6.0.0-SPRING-SUN-JDK-6 + +, CXF-CORE-AS-6.0.1-SUN-JDK-6 + +, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + +, CXF-BINDIST-AS-6.0.1-SUN-JDK-6 + +, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 + +, CXF-SRCDIST-AS-6.0.1-SUN-JDK-6 + +, CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-BINDIST-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ binary distribution against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.1 with SpringFramework libraires available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-CORE-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/CXF-LIGHT/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -11,6 +11,14 @@ , CXF-BINDIST-AS-6.0.0-SUN-JDK-6 , CXF-BINDIST-AS-6.0.0-SPRING-SUN-JDK-6 + +, CXF-CORE-AS-6.0.1-SUN-JDK-6 + +, CXF-CORE-AS-6.0.1-SPRING-SUN-JDK-6 + +, CXF-BINDIST-AS-6.0.1-SUN-JDK-6 + +, CXF-BINDIST-AS-6.0.1-SPRING-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-6.0.1-SPRING-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTestWithSpring + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.1 with SpringFramework libraries available and Sun JDK 6</description> + <actions class="vector"/> +</project> Added: framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/CXF-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=CXF-SRCDIST-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=cxf +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-cxf +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-cxf/target/jbossws-cxf-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.cxf.url@</remote> + <local>stack-cxf</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-cxf-(a)version.id@ source distribution against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-ALL/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -9,6 +9,12 @@ , NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6 , NATIVE-SRCDIST-AS-6.0.0-SUN-JDK-6 + +, NATIVE-CORE-AS-6.0.1-SUN-JDK-6 + +, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6 + +, NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute binary distribution tests +# +binaryDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/target/jbossws-native-bin-dist/output/test-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ binary distribution against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-CORE-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-CORE-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS="-Dinterop=true" +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute core tests +# +coreTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/**/target/surefire-reports/*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-LIGHT/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -7,6 +7,10 @@ NATIVE-CORE-AS-6.0.0-SUN-JDK-6 , NATIVE-BINDIST-AS-6.0.0-SUN-JDK-6 + +, NATIVE-CORE-AS-6.0.1-SUN-JDK-6 + +, NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6 </childProjects> </hudson.tasks.BuildTrigger> </publishers> Added: framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,75 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=NATIVE-SRCDIST-AS-6.0.1-SUN-JDK-6 + +WORKSPACE=`pwd` +STACK_ID=native +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +STACK_DIR=$WORKSPACE/stack-native +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + +# +# execute source distribution tests +# +sourceDistributionTest + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.junit.JUnitResultArchiver> + <testResults>stack-native/target/jbossws-native-src-dist/modules/testsuite/**/target/surefire-reports/TEST-*.xml</testResults> + </hudson.tasks.junit.JUnitResultArchiver> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.native.url@</remote> + <local>stack-native</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Build and test jbossws-native-(a)version.id@ source distribution against AS-6.0.1 with Sun JDK 6</description> + <actions class="vector"/> +</project> Modified: framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml 2011-01-03 16:08:17 UTC (rev 13538) +++ framework/trunk/hudson/hudson-home/jobs/SWITCH-ALL/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -3,7 +3,7 @@ <builders class="vector"/> <publishers class="vector"> <hudson.tasks.BuildTrigger> - <childProjects>SWITCH-BINDIST-AS-6.0.0</childProjects> + <childProjects>SWITCH-BINDIST-AS-6.0.0, SWITCH-BINDIST-AS-6.0.1</childProjects> </hudson.tasks.BuildTrigger> </publishers> <buildWrappers class="vector"/> Added: framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml =================================================================== --- framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml (rev 0) +++ framework/trunk/hudson/hudson-home/jobs/SWITCH-BINDIST-AS-6.0.1/config.xml 2011-01-04 09:24:53 UTC (rev 13539) @@ -0,0 +1,112 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <builders class="vector"> + <hudson.tasks.Shell> + <command> +# +# Module settings +# +MODULE=SWITCH-BINDIST-AS-6.0.1 + +WORKSPACE=`pwd` +JAVA_HOME=(a)java.home.sun.jdk6@ +HUDSON_DIR=$WORKSPACE/framework-hudson +TEST_OPTS= +JBOSS_TARGET=jboss601 +JBOSS_BIND_ADDRESS=(a)jboss.bind.address@ +JBOSS_CONFIG=(a)jboss.server.instance@ +JBOSS_INSTANCE=@hudson.home@/jobs/AS-6.0.1/workspace/JBossAS-6.0.1/build/target/(a)hudson.jboss601.build@ +CXF_BIN_DIST_DIR=@hudson.home(a)/jobs/CXF-BINDIST-AS-6.0.1-SUN-JDK-6/workspace/stack-cxf/ +NATIVE_BIN_DIST_DIR=@hudson.home(a)/jobs/NATIVE-BINDIST-AS-6.0.1-SUN-JDK-6/workspace/stack-native/ +CXF_AS_HOME=$WORKSPACE/cxf-as +NATIVE_AS_HOME=$WORKSPACE/native-as + +# +# load test functions +# +. $HUDSON_DIR/jboss/bin/jbossws-qa.sh + + +rm -rf $WORKSPACE/*.diff +rm -rf $WORKSPACE/modified-as + +rm -rf $CXF_AS_HOME +cp -r $JBOSS_INSTANCE $CXF_AS_HOME +JBOSS_HOME=$CXF_AS_HOME +STACK_DIR=$CXF_BIN_DIST_DIR +STACK_ID=cxf +setupEnv +redeployBinaryDistribution + +rm -rf $NATIVE_AS_HOME +cp -r $JBOSS_INSTANCE $NATIVE_AS_HOME +JBOSS_HOME=$NATIVE_AS_HOME +STACK_DIR=$NATIVE_BIN_DIST_DIR +STACK_ID=native +setupEnv +redeployBinaryDistribution + +JBOSS_HOME=$WORKSPACE/modified-as + +#------------------------------------- CXF stack checks ------------------------------------- + +cp -r $NATIVE_AS_HOME $JBOSS_HOME +STACK_DIR=$CXF_BIN_DIST_DIR +STACK_ID=cxf +setupEnv +redeployBinaryDistribution +diff -r $CXF_AS_HOME $JBOSS_HOME -x jbossws-native-core.jar -x netty.jar > $WORKSPACE/cxf_vs_cxfOverNative.diff +rm -rf $JBOSS_HOME + + +#------------------------------------- NATIVE stack checks ------------------------------------- + +cp -r $CXF_AS_HOME $JBOSS_HOME +STACK_DIR=$NATIVE_BIN_DIST_DIR +STACK_ID=native +setupEnv +redeployBinaryDistribution +diff -r $NATIVE_AS_HOME $JBOSS_HOME > $WORKSPACE/native_vs_nativeOverCxf.diff +rm -rf $JBOSS_HOME + + +rm -rf $CXF_AS_HOME +rm -rf $NATIVE_AS_HOME + +</command> + </hudson.tasks.Shell> + </builders> + <publishers class="vector"> + <hudson.tasks.Mailer> + <recipients>@hudson.mail.recipients@</recipients> + <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> + <buildWrappers class="vector"/> + <scm class="hudson.scm.SubversionSCM"> + <locations> + <hudson.scm.SubversionSCM-ModuleLocation> + <remote>@hudson.framework.url@/hudson</remote> + <local>framework-hudson</local> + </hudson.scm.SubversionSCM-ModuleLocation> + </locations> + <useUpdate>true</useUpdate> + <browser class="hudson.scm.browsers.FishEyeSVN"> + <url>http://fisheye.jboss.com/browse/JBossWS/</url> + <rootModule></rootModule> + </browser> + </scm> + <canRoam>true</canRoam> + <disabled>false</disabled> + <enableRemoteTrigger>false</enableRemoteTrigger> + <triggers class="vector"/> + <logRotator> + <daysToKeep>14</daysToKeep> + <numToKeep>-1</numToKeep> + </logRotator> + <keepDependencies>false</keepDependencies> + <properties/> + <description>Test jbossws bindist stack switch against AS 6.0.1</description> + <actions class="vector"/> +</project>

13 years, 12 months

1
0
0 / 0

JBossWS SVN: r13538 - in stack/native/branches/jbossws-native-3.1.2/modules: testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: ghjboss Date: 2011-01-03 11:08:17 -0500 (Mon, 03 Jan 2011) New Revision: 13538 Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java Log: [JBPAPP-5710] - port the changes in "[JBWS-3192] Set application/fastinfoset content-type on request messages when FastInfosetFeature is on" Modified: stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2010-12-29 10:54:13 UTC (rev 13537) +++ stack/native/branches/jbossws-native-3.1.2/modules/core/src/main/java/org/jboss/ws/core/soap/SOAPMessageImpl.java 2011-01-03 16:08:17 UTC (rev 13538) @@ -59,6 +59,7 @@ import org.jboss.ws.core.soap.attachment.MultipartRelatedSwAEncoder; import org.jboss.ws.core.soap.attachment.MultipartRelatedXOPEncoder; import org.jboss.ws.extensions.xop.XOPContext; +import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.ws.metadata.umdm.EndpointMetaData; import org.jboss.ws.metadata.umdm.OperationMetaData; import org.w3c.dom.Node; @@ -299,10 +300,9 @@ return new MimeMatchingAttachmentsIterator(headers, attachments); } - private String getSOAPContentType() throws SOAPException + private String getSOAPContentType(CommonMessageContext msgContext) throws SOAPException { //Check binding type in the endpoint metadata - CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); if (msgContext != null && Constants.SOAP12HTTP_BINDING.equalsIgnoreCase(msgContext.getEndpointMetaData().getBindingId())) { return SOAPConstants.SOAP_1_2_CONTENT_TYPE; @@ -329,7 +329,8 @@ throw new IllegalStateException("XOP parameter not properly inlined"); // default content-type - String contentType = getSOAPContentType() + "; charset=" + getCharSetEncoding(); + CommonMessageContext msgContext = MessageContextAssociation.peekMessageContext(); + String contentType = getSOAPContentType(msgContext) + "; charset=" + getCharSetEncoding(); if (hasAttachments) { @@ -346,6 +347,10 @@ contentType = multipartRelatedEncoder.getContentType(); } } + else if (msgContext != null && msgContext.getEndpointMetaData().getFeatures().isFeatureEnabled(FastInfosetFeature.class)) + { + contentType = MimeConstants.TYPE_FASTINFOSET; + } //JBWS-2964:Create a new mimeHeaders to avoid changing another referenced mimeHeaders MimeHeaders newMimeHeaders = new MimeHeaders(); Iterator iterator = mimeHeaders.getAllHeaders(); Modified: stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java =================================================================== --- stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2010-12-29 10:54:13 UTC (rev 13537) +++ stack/native/branches/jbossws-native-3.1.2/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/fastinfoset/FastInfosetTestCase.java 2011-01-03 16:08:17 UTC (rev 13538) @@ -32,6 +32,7 @@ import junit.framework.Test; +import org.jboss.ws.core.soap.attachment.MimeConstants; import org.jboss.ws.feature.FastInfosetFeature; import org.jboss.wsf.common.DOMUtils; import org.jboss.wsf.test.JBossWSTest; @@ -79,6 +80,7 @@ int resCode = con.getResponseCode(); assertEquals(200, resCode); + assertEquals(MimeConstants.TYPE_FASTINFOSET, con.getContentType()); } public void testRoundTrip() throws Exception

13 years, 12 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 January 2011