February 2012 - jbossws-commits - Jboss List Archives

JBossWS SVN: r15742 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-25 02:16:57 -0500 (Sat, 25 Feb 2012) New Revision: 15742 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml Log: Merged revisions 15738 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15738 | alessio.soldano(a)jboss.com | 2012-02-24 17:41:02 +0100 (Fri, 24 Feb 2012) | 2 lines Adding ASIL 710 ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/pom.xml 2012-02-25 07:16:57 UTC (rev 15742) @@ -45,6 +45,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss710</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -154,6 +161,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -255,6 +268,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <classifier>tests-integration</classifier> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-25 07:12:09 UTC (rev 15741) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-25 07:16:57 UTC (rev 15742) @@ -152,7 +152,7 @@ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-25 07:12:09 UTC (rev 15741) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-25 07:16:57 UTC (rev 15742) @@ -77,6 +77,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> + <include>org.jboss.ws:jbossws-jboss710:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -110,6 +111,17 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> + <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/resources/pom.xml 2012-02-25 07:16:57 UTC (rev 15742) @@ -45,6 +45,7 @@ <excludes> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> + <exclude>**/jbossws-jboss710/**</exclude> </excludes> </configuration> </execution> @@ -66,6 +67,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss710</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss710</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) +++ stack/cxf/branches/jbossws-cxf-4.0.x/pom.xml 2012-02-25 07:16:57 UTC (rev 15742) @@ -66,6 +66,7 @@ <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> + <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> @@ -169,12 +170,21 @@ <version>${jbossws.jboss702.version}</version> <classifier>tests-integration</classifier> </dependency> -  <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss710.version}</version> + <version>${jboss711.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15741 - in stack/native/branches/jbossws-native-4.0.x: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-25 02:12:09 -0500 (Sat, 25 Feb 2012) New Revision: 15741 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/build.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/pom.xml Log: Merged revisions 15739-15740 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15739 | alessio.soldano(a)jboss.com | 2012-02-24 18:45:48 +0100 (Fri, 24 Feb 2012) | 2 lines Adding AS710 ASIL ....... r15740 | alessio.soldano(a)jboss.com | 2012-02-24 18:54:11 +0100 (Fri, 24 Feb 2012) | 2 lines Fixing typo in previous jboss700 support removal ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740 Modified: stack/native/branches/jbossws-native-4.0.x/build.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/build.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/build.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -82,10 +82,10 @@ <condition> <and> <not> - <isset property="jboss702.home"/> + <isset property="jboss701.home"/> </not> <not> - <isset property="jboss700.home"/> + <isset property="jboss702.home"/> </not> <not> <isset property="jboss710.home"/> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -57,6 +57,13 @@ </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss710</classifier> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> @@ -133,6 +140,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -242,6 +255,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <classifier>tests-integration</classifier> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/distro/build-deploy.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -152,7 +152,7 @@ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -71,6 +71,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> + <include>org.jboss.ws:jbossws-jboss710:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -102,6 +103,17 @@ </dependencySet> <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -45,6 +45,7 @@ <excludes> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> + <exclude>**/jbossws-jboss710/**</exclude> </excludes> </configuration> </execution> @@ -66,6 +67,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss710</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss710</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/branches/jbossws-native-4.0.x/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-24 17:54:11 UTC (rev 15740) +++ stack/native/branches/jbossws-native-4.0.x/pom.xml 2012-02-25 07:12:09 UTC (rev 15741) @@ -65,6 +65,7 @@ <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> + <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> @@ -145,12 +146,21 @@ <version>${jbossws.jboss702.version}</version> <classifier>tests-integration</classifier> </dependency> -  <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss710.version}</version> + <version>${jboss711.version}</version> </dependency>  <dependency>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15740 - stack/native/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 12:54:11 -0500 (Fri, 24 Feb 2012) New Revision: 15740 Modified: stack/native/trunk/build.xml Log: Fixing typo in previous jboss700 support removal Modified: stack/native/trunk/build.xml =================================================================== --- stack/native/trunk/build.xml 2012-02-24 17:45:48 UTC (rev 15739) +++ stack/native/trunk/build.xml 2012-02-24 17:54:11 UTC (rev 15740) @@ -82,10 +82,10 @@ <condition> <and> <not> - <isset property="jboss702.home"/> + <isset property="jboss701.home"/> </not> <not> - <isset property="jboss700.home"/> + <isset property="jboss702.home"/> </not> <not> <isset property="jboss710.home"/>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15739 - in stack/native/trunk: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 12:45:48 -0500 (Fri, 24 Feb 2012) New Revision: 15739 Modified: stack/native/trunk/modules/dist/pom.xml stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/native/trunk/modules/resources/pom.xml stack/native/trunk/pom.xml Log: Adding AS710 ASIL Modified: stack/native/trunk/modules/dist/pom.xml =================================================================== --- stack/native/trunk/modules/dist/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) +++ stack/native/trunk/modules/dist/pom.xml 2012-02-24 17:45:48 UTC (rev 15739) @@ -56,6 +56,13 @@ </dependency> <dependency> + <groupId>org.jboss.ws.native</groupId> + <artifactId>jbossws-native-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss710</classifier> + </dependency> + + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-common-tools</artifactId> <scope>provided</scope> @@ -132,6 +139,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -241,6 +254,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <classifier>tests-integration</classifier> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-24 16:41:02 UTC (rev 15738) +++ stack/native/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-24 17:45:48 UTC (rev 15739) @@ -152,7 +152,7 @@ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-24 16:41:02 UTC (rev 15738) +++ stack/native/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-24 17:45:48 UTC (rev 15739) @@ -71,6 +71,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> + <include>org.jboss.ws:jbossws-jboss710:jar</include> <include>org.jboss:jbossxb:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> @@ -102,6 +103,17 @@ </dependencySet> <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> + <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> Modified: stack/native/trunk/modules/resources/pom.xml =================================================================== --- stack/native/trunk/modules/resources/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) +++ stack/native/trunk/modules/resources/pom.xml 2012-02-24 17:45:48 UTC (rev 15739) @@ -45,6 +45,7 @@ <excludes> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> + <exclude>**/jbossws-jboss710/**</exclude> </excludes> </configuration> </execution> @@ -66,6 +67,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss710</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss710</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) +++ stack/native/trunk/pom.xml 2012-02-24 17:45:48 UTC (rev 15739) @@ -65,6 +65,7 @@ <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> + <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> @@ -145,12 +146,21 @@ <version>${jbossws.jboss702.version}</version> <classifier>tests-integration</classifier> </dependency> -  <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss710.version}</version> + <version>${jboss711.version}</version> </dependency>  <dependency>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15738 - in stack/cxf/trunk: modules/dist and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 11:41:02 -0500 (Fri, 24 Feb 2012) New Revision: 15738 Modified: stack/cxf/trunk/modules/dist/pom.xml stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml stack/cxf/trunk/modules/resources/pom.xml stack/cxf/trunk/pom.xml Log: Adding ASIL 710 Modified: stack/cxf/trunk/modules/dist/pom.xml =================================================================== --- stack/cxf/trunk/modules/dist/pom.xml 2012-02-24 14:42:27 UTC (rev 15737) +++ stack/cxf/trunk/modules/dist/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) @@ -45,6 +45,13 @@ <dependency> <groupId>org.jboss.ws.cxf</groupId> + <artifactId>jbossws-cxf-resources</artifactId> + <version>${project.version}</version> + <classifier>jboss710</classifier> + </dependency> + + <dependency> + <groupId>org.jboss.ws.cxf</groupId> <artifactId>jbossws-cxf-server</artifactId> <version>${project.version}</version> </dependency> @@ -161,6 +168,12 @@ </exclusions> </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -262,6 +275,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <classifier>tests-integration</classifier> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> <scope>provided</scope> Modified: stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-24 14:42:27 UTC (rev 15737) +++ stack/cxf/trunk/modules/dist/src/main/distro/build-deploy.xml 2012-02-24 16:41:02 UTC (rev 15738) @@ -152,7 +152,7 @@ <target name="undeploy-jboss710" depends="target-jboss710,init" description="Remove jbossws from jboss710"> <fail message="Not available: ${jboss710.available.file}" unless="jboss710.available"/> - <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="false"/> + <macro-undeploy-jbossws-modules targetdir="${jboss710.home}" defaultmodulesconf="${jbossws.default.modules.conf}" modifyjbossintegration="true"/> </target>  Modified: stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-24 14:42:27 UTC (rev 15737) +++ stack/cxf/trunk/modules/dist/src/main/scripts/assembly-deploy-artifacts.xml 2012-02-24 16:41:02 UTC (rev 15738) @@ -81,6 +81,7 @@ <include>org.jboss.ws:jbossws-common-tools:jar</include> <include>org.jboss.ws:jbossws-jboss701:jar</include> <include>org.jboss.ws:jbossws-jboss702:jar</include> + <include>org.jboss.ws:jbossws-jboss710:jar</include> <include>org.jboss.as:jboss-as-webservices-tests-integration:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> @@ -114,6 +115,17 @@ <outputDirectory>deploy-artifacts/lib</outputDirectory> <unpack>false</unpack> <includes> + <include>org.jboss.ws:jbossws-jboss710:jar:*:tests-integration</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}${dashClassifier}.${artifact.extension}</outputFileNameMapping> + <scope>provided</scope> + <useProjectArtifact>false</useProjectArtifact> + </dependencySet> + + <dependencySet> + <outputDirectory>deploy-artifacts/lib</outputDirectory> + <unpack>false</unpack> + <includes> <include>org.jboss.ws:jbossws-shared-testsuite:jar</include> </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> Modified: stack/cxf/trunk/modules/resources/pom.xml =================================================================== --- stack/cxf/trunk/modules/resources/pom.xml 2012-02-24 14:42:27 UTC (rev 15737) +++ stack/cxf/trunk/modules/resources/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) @@ -45,6 +45,7 @@ <excludes> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> + <exclude>**/jbossws-jboss710/**</exclude> </excludes> </configuration> </execution> @@ -66,6 +67,15 @@ <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss702/jbossws.beans</classesDirectory> </configuration> </execution> + <execution> + <id>jboss710</id> + <goals><goal>jar</goal></goals> + <phase>package</phase> + <configuration> + <classifier>jboss710</classifier> + <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss710/jbossws.beans</classesDirectory> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2012-02-24 14:42:27 UTC (rev 15737) +++ stack/cxf/trunk/pom.xml 2012-02-24 16:41:02 UTC (rev 15738) @@ -66,6 +66,7 @@ <jbossws.shared.testsuite.version>4.0.2-SNAPSHOT</jbossws.shared.testsuite.version> <jbossws.jboss701.version>4.0.1.GA</jbossws.jboss701.version> <jbossws.jboss702.version>4.0.1.GA</jbossws.jboss702.version> + <jbossws.jboss710.version>4.0.2-SNAPSHOT</jbossws.jboss710.version> <jboss701.version>7.0.1.Final</jboss701.version> <jboss702.version>7.0.2.Final</jboss702.version> <jboss710.version>7.1.0.Final</jboss710.version> @@ -170,12 +171,21 @@ <version>${jbossws.jboss702.version}</version> <classifier>tests-integration</classifier> </dependency> -  <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss710</artifactId> + <version>${jbossws.jboss710.version}</version> + <classifier>tests-integration</classifier> + </dependency> + <dependency> <groupId>org.jboss.as</groupId> <artifactId>jboss-as-webservices-tests-integration</artifactId> - <version>${jboss710.version}</version> + <version>${jboss711.version}</version> </dependency> <dependency> <groupId>org.jboss.ws.projects</groupId>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15737 - in common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss: wsf/common and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-02-24 09:42:27 -0500 (Fri, 24 Feb 2012) New Revision: 15737 Modified: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/ws/Constants.java common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/wsf/common/DOMWriter.java Log: [JBPAPP-8226] DOMWriter shouldn't flush the output stream after every element Modified: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/ws/Constants.java =================================================================== --- common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/ws/Constants.java 2012-02-24 14:41:08 UTC (rev 15736) +++ common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/ws/Constants.java 2012-02-24 14:42:27 UTC (rev 15737) @@ -304,4 +304,6 @@ static final String DOM_CONTENT_CANONICAL_NORMALIZATION = "org.jboss.ws.DOMContentCanonicalNormalization"; static final String ALWAYS_RESOLVE_DOCUMENT_BUILDER_FACTORY = "org.jboss.ws.alwaysResolveDocumentBuilderFactory"; + + static final String FLUSH_ONLY_ONCE = "org.jboss.ws.domwriter.FlushOnlyOnce"; } Modified: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/wsf/common/DOMWriter.java =================================================================== --- common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/wsf/common/DOMWriter.java 2012-02-24 14:41:08 UTC (rev 15736) +++ common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/src/main/java/org/jboss/wsf/common/DOMWriter.java 2012-02-24 14:42:27 UTC (rev 15737) @@ -71,6 +71,8 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; +import org.jboss.ws.Constants; + /** * Traverse a DOM tree in order to print a document that is parsed. * @@ -102,7 +104,15 @@ private boolean completeNamespaces = true; // The current default namespace private String currentDefaultNamespace; + // How often should we flush the output stream? + private static final boolean flushOnlyOnce; + static + { + flushOnlyOnce = System.getProperty(Constants.FLUSH_ONLY_ONCE, "false") + .equals("true"); + } + public DOMWriter(Writer w) { this.out = new PrintWriter(w); @@ -231,6 +241,8 @@ rootNode = node; printInternal(node, false); + if(flushOnlyOnce) + out.flush(); } private void printInternal(Node node, boolean indentEndMarker) @@ -510,7 +522,9 @@ out.print('\n'); } } - out.flush(); + + if(!flushOnlyOnce) + out.flush(); } private String getNamespaceURI(String prefix, Element element, Node stopNode)

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15736 - common/branches.

by jbossws-commits＠lists.jboss.org

Author: klape Date: 2012-02-24 09:41:08 -0500 (Fri, 24 Feb 2012) New Revision: 15736 Added: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8226/ Removed: common/branches/jbossws-common-1.1.0.SP8_JBPAPP-8026/ Log: changing one-off patch for 5.1.2 to a different jira

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15735 - in stack/native/branches/jbossws-native-4.0.x: modules/dist/src/main/scripts and 4 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 09:27:43 -0500 (Fri, 24 Feb 2012) New Revision: 15735 Modified: stack/native/branches/jbossws-native-4.0.x/ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml Log: Merged revisions 15726-15727,15731 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/native/trunk ....... r15726 | alessio.soldano(a)jboss.com | 2012-02-24 12:23:13 +0100 (Fri, 24 Feb 2012) | 2 lines [JBWS-3435] Moving appclient patching to the modules actually using it and also running the task in pre-integration-test maven phase only to avoid duplicated exections ....... r15727 | alessio.soldano(a)jboss.com | 2012-02-24 12:24:51 +0100 (Fri, 24 Feb 2012) | 2 lines Leftovers from previous removal of 700 target ....... r15731 | ropalka | 2012-02-24 15:14:42 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3435] update bin distro to be able to execute appclient tests too ....... Property changes on: stack/native/branches/jbossws-native-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-1567... Modified: svn:mergeinfo - /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714 + /stack/native/branches/asoldano:14057,14069 /stack/native/branches/ropalka:13836-13879 /stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731 Modified: stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -72,6 +72,11 @@ <include>etc/**</include> </includes> </fileSet> +  + <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-native-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet>  <fileSet> <directory>target/exclude-file</directory> Modified: stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/resources/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -43,22 +43,12 @@ <phase>package</phase> <configuration> <excludes> - <exclude>**/jbossws-jboss700/**</exclude> <exclude>**/jbossws-jboss701/**</exclude> <exclude>**/jbossws-jboss702/**</exclude> </excludes> </configuration> </execution> <execution> - <id>jboss700</id> - <goals><goal>jar</goal></goals> - <phase>package</phase> - <configuration> - <classifier>jboss700</classifier> - <classesDirectory>${project.build.directory}/classes/resources/jbossws-jboss700/jbossws.beans</classesDirectory> - </configuration> - </execution> - <execution> <id>jboss701</id> <goals><goal>jar</goal></goals> <phase>package</phase> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/native-tests/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -119,6 +119,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -1347,61 +1347,6 @@ </properties> </profile> - <profile> - <id>noprepare</id> - <activation> - <property> - <name>!noprepare</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>appclient-patch</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> -  -  - <tasks> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 1-st attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 2-nd attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) +++ stack/native/branches/jbossws-native-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:27:43 UTC (rev 15735) @@ -133,6 +133,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> </plugins>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15734 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/dist/src/main/scripts and 2 other directories.

by jbossws-commits＠lists.jboss.org

Author: ropalka Date: 2012-02-24 09:20:57 -0500 (Fri, 24 Feb 2012) New Revision: 15734 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml Log: Merged revisions 15723,15725,15730 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15723 | alessio.soldano(a)jboss.com | 2012-02-24 11:58:44 +0100 (Fri, 24 Feb 2012) | 2 lines [JBWS-3435] Moving appclient patching to the module that actually needs that only (shared testsuite in cxf stack) and also running the task in pre-integration-test maven phase only to avoid duplicated exections ....... r15725 | ropalka | 2012-02-24 12:05:18 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3444] enabling last excluded appclient test in CXF test suite ....... r15730 | ropalka | 2012-02-24 15:11:48 +0100 (Fri, 24 Feb 2012) | 1 line [JBWS-3435] update bin distro to be able to execute appclient tests too ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15675,15682,15695-15697,15708,15711,15713,15719,15723-15730 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/dist/src/main/scripts/assembly-bin-dist.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -90,7 +90,12 @@ <include>resources/jaxws/samples/**</include> </includes> </fileSet> +  <fileSet> + <directory>../testsuite/src/test/resources/</directory> + <outputDirectory>jbossws-cxf-bin-dist/tests/etc/appclient</outputDirectory> + </fileSet> + <fileSet> <directory>../testsuite/cxf-tests/scripts</directory> <outputDirectory>jbossws-cxf-bin-dist/tests/ant-import</outputDirectory> <includes> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -1346,10 +1346,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/jaxr/**</exclude> - -  - <exclude>org/jboss/test/ws/jaxrpc/samples/secureejb/**</exclude> - </excludes> </configuration> </plugin> @@ -1399,61 +1395,6 @@ </properties> </profile> - <profile> - <id>noprepare</id> - <activation> - <property> - <name>!noprepare</name> - </property> - </activation> - <build> - <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>appclient-patch</id> - <phase>generate-sources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> -  -  - <tasks> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 1-st attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/../src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXX patching appclient 2-nd attempt XXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <echo message="XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"/> - <copy - file="${basedir}/src/test/resources/${jbossws.integration.target}/appclient.xml" - tofile="${jboss.home}/appclient/configuration/appclient.xml" - failonerror="false" - verbose="true" - overwrite="true" - /> - </tasks> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:13 UTC (rev 15733) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/shared-tests/pom.xml 2012-02-24 14:20:57 UTC (rev 15734) @@ -132,6 +132,24 @@ </tasks> </configuration> </execution> + <execution> + <id>appclient-patch</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <copy + file="${project.parent.build.directory}/../src/test/resources/${jbossws.integration.target}/appclient.xml" + tofile="${jboss.home}/appclient/configuration/appclient.xml" + failonerror="false" + verbose="true" + overwrite="true" + /> + </tasks> + </configuration> + </execution> </executions> </plugin> <plugin>

12 years, 10 months

1
0
0 / 0

JBossWS SVN: r15733 - container/jboss71/branches/jbossws-jboss710.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2012-02-24 09:20:13 -0500 (Fri, 24 Feb 2012) New Revision: 15733 Modified: container/jboss71/branches/jbossws-jboss710/ Log: Setting svn:ignore Property changes on: container/jboss71/branches/jbossws-jboss710 ___________________________________________________________________ Added: svn:ignore + .classpath .project .settings target

12 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits February 2012