May 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r7211 - in stack/native/trunk/modules/testsuite/native-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 10:42:51 -0400 (Thu, 29 May 2008) New Revision: 7211 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml Log: [JBWS-2168] use test scope Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:34:05 UTC (rev 7210) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:42:51 UTC (rev 7211) @@ -22,14 +22,13 @@ <version>1.4</version> <scope>test</scope> </dependency> -  </dependencies>  Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 14:34:05 UTC (rev 7210) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 14:42:51 UTC (rev 7211) @@ -12,7 +12,7 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> -  + <scope>test</scope> <unpack>false</unpack> <includes> <include>*:bpel:sar</include>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7210 - in stack/native/trunk/modules/testsuite/native-tests: scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 10:34:05 -0400 (Thu, 29 May 2008) New Revision: 7210 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-bpel.xml Log: [JBWS-2168] more on BPEL samples - but they are uncommented for now Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:25:49 UTC (rev 7209) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 14:34:05 UTC (rev 7210) @@ -22,6 +22,14 @@ <version>1.4</version> <scope>test</scope> </dependency> +  </dependencies>  @@ -40,7 +48,29 @@ </activation> <build> <plugins> +  + <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions>  <fail message="File ${thirdparty.dir}/bpel.sar is not available"> <condition><not><available file="${thirdparty.dir}/bpel.sar"/></not></condition> </fail> - <fail message="File ${thirdparty.dir}/commons-collections.jar is not available"> +   <unzip src="${thirdparty.dir}/bpel.sar" dest="${thirdparty.dir}/jbpm-bpel"/> @@ -49,12 +49,12 @@ <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-bpel.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/jbpm-jpdl.jar" /> <pathelement location="${thirdparty.dir}/jbpm-bpel/commons-lang.jar" /> - <pathelement location="${thirdparty.dir}/commons-collections.jar"/> +  </path>

16 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 10:25:49 -0400 (Thu, 29 May 2008) New Revision: 7209 Modified: stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2168] refactor BPEL samples assembly Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-29 14:07:24 UTC (rev 7208) +++ stack/native/trunk/pom.xml 2008-05-29 14:25:49 UTC (rev 7209) @@ -53,13 +53,9 @@ <jbossws.jboss501.version>3.0.0-SNAPSHOT</jbossws.jboss501.version> <codehaus.jettison.version>1.0-RC2</codehaus.jettison.version> <commons.logging.version>1.1.1</commons.logging.version> - <commons.collections.version>3.1</commons.collections.version> - <dom4j.version>1.6.1</dom4j.version> <javassist.version>3.6.0.GA</javassist.version> <jaxb.api.version>2.1</jaxb.api.version> <jaxb.impl.version>2.1.6</jaxb.impl.version> - <jaxen.version>1.1-beta-11</jaxen.version> - <jboss.common.logging.log4j.version>2.0.4.GA</jboss.common.logging.log4j.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> <jboss.jbosssx.version>2.0.2.Beta4</jboss.jbosssx.version> @@ -67,7 +63,6 @@ <jboss.logging.version>2.0.5.GA</jboss.logging.version> <jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version> <jboss.remoting.version>2.4.0.CR1</jboss.remoting.version> - <jbpm.bpel.version>1.1.0.Beta5</jbpm.bpel.version> <juddi.service.version>1.2.0.GA</juddi.service.version> <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> @@ -264,50 +259,6 @@ <version>${commons.logging.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>${commons.collections.version}</version> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>${dom4j.version}</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>${jaxen.version}</version> - <exclusions> - <exclusion> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - </exclusion> - <exclusion> - <groupId>xerces</groupId> - <artifactId>xmlParserAPIs</artifactId> - </exclusion> - <exclusion> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-logging-log4j</artifactId> - <version>${jboss.common.logging.log4j.version}</version> - <exclusions> - <exclusion> - <groupId>apache-xerces</groupId> - <artifactId>xml-apis</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>com.sun.xml.fastinfoset</groupId> <artifactId>FastInfoset</artifactId> <version>${sun.fastinfoset.version}</version> @@ -404,12 +355,6 @@ <artifactId>xmlsec</artifactId> <version>${xmlsec.version}</version> </dependency> - <dependency> - <groupId>jboss.jbpm</groupId> - <artifactId>bpel</artifactId> - <version>${jbpm.bpel.version}</version> - <type>sar</type> - </dependency> </dependencies> </dependencyManagement> @@ -519,34 +464,6 @@ <scope>runtime</scope> <type>sar</type> </dependency> -  </dependencies>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 14:07:24 UTC (rev 7208) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 14:25:49 UTC (rev 7209) @@ -35,13 +35,6 @@ <include>*:jbossws-jboss500:jar</include> <include>*:jbossws-jboss501:jar</include> <include>*:juddi-service:sar</include> -  </includes> </dependencySet> <dependencySet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7208 - stack/native/trunk/modules/testsuite/native-tests/scripts.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 10:07:24 -0400 (Thu, 29 May 2008) New Revision: 7208 Added: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml Log: [JBWS-2168] BPEL samples assembly Added: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml (rev 0) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml 2008-05-29 14:07:24 UTC (rev 7208) @@ -0,0 +1,29 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + + <id>bpel-artifacts</id> + <formats> + <format>dir</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + <useStrictFiltering>true</useStrictFiltering> +  + <unpack>false</unpack> + <includes> + <include>*:bpel:sar</include> + <include>*:commons-collections:jar</include> + <include>*:dom4j:jar</include> + <include>*:jaxen:jar</include> + <include>*:jboss-common-logging-log4j:jar</include> + <include>*:commons-logging:jar</include> + <include>*:wsdl4j:jar</include> + </includes> + </dependencySet> + </dependencySets> + +</assembly> Property changes on: stack/native/trunk/modules/testsuite/native-tests/scripts/assembly-bpel-artifacts.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7207 - stack/native/trunk/modules/core.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-29 08:08:48 -0400 (Thu, 29 May 2008) New Revision: 7207 Modified: stack/native/trunk/modules/core/pom.xml Log: Add direct dependencies which were lost because of scope runtime Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) +++ stack/native/trunk/modules/core/pom.xml 2008-05-29 12:08:48 UTC (rev 7207) @@ -60,6 +60,11 @@  <dependency> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.jboss.microcontainer</groupId> <artifactId>jboss-kernel</artifactId> <scope>provided</scope>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7206 - in stack/native/trunk: modules/core and 5 other directories.

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-29 07:30:16 -0400 (Thu, 29 May 2008) New Revision: 7206 Modified: stack/native/trunk/modules/core/pom.xml stack/native/trunk/modules/embedded/pom.xml stack/native/trunk/modules/saaj/pom.xml stack/native/trunk/modules/testsuite/native-tests/pom.xml stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml stack/native/trunk/pom.xml stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: Add direct dependencies which were lost because of scope runtime Disable bpel Modified: stack/native/trunk/modules/core/pom.xml =================================================================== --- stack/native/trunk/modules/core/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/core/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -38,6 +38,11 @@  <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <scope>provided</scope> @@ -59,6 +64,20 @@ <artifactId>jboss-kernel</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <scope>provided</scope> + </dependency>  <dependency> @@ -114,10 +133,6 @@ <artifactId>wsdl4j</artifactId> </dependency> <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency> - <dependency> <groupId>xml-security</groupId> <artifactId>xmlsec</artifactId> </dependency> @@ -131,6 +146,12 @@ <build> <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <showDeprecation>false</showDeprecation> + </configuration> + </plugin> + <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> <execution> Modified: stack/native/trunk/modules/embedded/pom.xml =================================================================== --- stack/native/trunk/modules/embedded/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/embedded/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -18,6 +18,14 @@ <dependencies>  <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <dependency> <groupId>org.jboss.ws.native</groupId> <artifactId>jbossws-native-jaxws-ext</artifactId> <version>${version}</version> @@ -40,8 +48,7 @@ <showWarnings>false</showWarnings> </configuration> </plugin> - </plugins> - </build> + </project> Modified: stack/native/trunk/modules/saaj/pom.xml =================================================================== --- stack/native/trunk/modules/saaj/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/saaj/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -14,4 +14,12 @@ <relativePath>../../pom.xml</relativePath> </parent> +  + <dependencies> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + </dependencies> + </project> Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -43,6 +43,7 @@ <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> +  <execution> <id>wsconsume</id> <phase>generate-sources</phase> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/antrun-wstools.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -43,7 +43,7 @@ <macro-wstools dest="jaxrpc/samples/secureejb/META-INF" config="jaxrpc/samples/secureejb/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/hello/WEB-INF" config="jaxrpc/samples/wsaddr/hello/wstools-config.xml"/> <macro-wstools dest="jaxrpc/samples/wsaddr/replyto/WEB-INF" config="jaxrpc/samples/wsaddr/replyto/wstools-config.xml"/> - <macro-wstools dest="jaxrpc/samples/wsbpel/hello/WEB-INF" config="jaxrpc/samples/wsbpel/hello/wstools-config.xml"/> +  <macro-wstools dest="jaxrpc/samples/wssecurity/WEB-INF" config="jaxrpc/samples/wssecurity/wstools-config.xml"/> </target> Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxrpc.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -633,7 +633,7 @@ </metainf> </jar> -  +   <war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wssecurity-sign.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> Modified: stack/native/trunk/pom.xml =================================================================== --- stack/native/trunk/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/pom.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -55,16 +55,19 @@ <commons.logging.version>1.1.1</commons.logging.version> <commons.collections.version>3.1</commons.collections.version> <dom4j.version>1.6.1</dom4j.version> + <javassist.version>3.6.0.GA</javassist.version> + <jaxb.api.version>2.1</jaxb.api.version> + <jaxb.impl.version>2.1.6</jaxb.impl.version> <jaxen.version>1.1-beta-11</jaxen.version> <jboss.common.logging.log4j.version>2.0.4.GA</jboss.common.logging.log4j.version> - <javassist.version>3.6.0.GA</javassist.version> <jboss.common.version>1.2.1.GA</jboss.common.version> <jboss.jaxbintros.version>1.0.0.beta2</jboss.jaxbintros.version> + <jboss.jbosssx.version>2.0.2.Beta4</jboss.jbosssx.version> + <jboss.jbossxb.version>1.0.0.SP2</jboss.jbossxb.version> <jboss.logging.version>2.0.5.GA</jboss.logging.version> <jboss.microcontainer.version>2.0.0.Beta11</jboss.microcontainer.version> <jboss.remoting.version>2.4.0.CR1</jboss.remoting.version> - <jaxb.api.version>2.1</jaxb.api.version> - <jaxb.impl.version>2.1.6</jaxb.impl.version> + <jbpm.bpel.version>1.1.0.Beta5</jbpm.bpel.version> <juddi.service.version>1.2.0.GA</juddi.service.version> <sun.fastinfoset.version>1.2.2</sun.fastinfoset.version> <sun.jaxws.version>2.1.3</sun.jaxws.version> @@ -73,7 +76,7 @@ <wsdl4j.version>1.6.1</wsdl4j.version> <xmlsec.version>1.3.0</xmlsec.version> <xalan.version>2.7.0</xalan.version> - <jbpm.bpel.version>1.1.0.Beta5</jbpm.bpel.version> + <xerces.version>2.8.1</xerces.version> </properties>  @@ -186,6 +189,16 @@  <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>javax.ejb</groupId> <artifactId>ejb-api</artifactId> <version>3.0</version> @@ -218,6 +231,16 @@ <version>${jboss.common.version}</version> </dependency> <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>${jboss.jbossxb.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.security</groupId> + <artifactId>jbosssx</artifactId> + <version>${jboss.jbosssx.version}</version> + </dependency> + <dependency> <groupId>jboss.remoting</groupId> <artifactId>jboss-remoting</artifactId> <version>${jboss.remoting.version}</version> @@ -316,6 +339,11 @@ </exclusions> </dependency> <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${jaxb.api.version}</version> + </dependency> + <dependency> <groupId>com.sun.xml.bind</groupId> <artifactId>jaxb-impl</artifactId> <version>${jaxb.impl.version}</version> @@ -326,11 +354,6 @@ <version>${jaxb.impl.version}</version> </dependency> <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <version>${jaxb.api.version}</version> - </dependency> - <dependency> <groupId>jboss.jaxbintros</groupId> <artifactId>jboss-jaxb-intros</artifactId> <version>${jboss.jaxbintros.version}</version> @@ -372,6 +395,11 @@ <version>${xalan.version}</version> </dependency> <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version}</version> + </dependency> + <dependency> <groupId>xml-security</groupId> <artifactId>xmlsec</artifactId> <version>${xmlsec.version}</version> @@ -385,9 +413,16 @@ </dependencies> </dependencyManagement> -  <dependencies> +  <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <scope>runtime</scope> @@ -484,6 +519,7 @@ <scope>runtime</scope> <type>sar</type> </dependency> +  </dependencies>  Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 10:22:54 UTC (rev 7205) +++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 11:30:16 UTC (rev 7206) @@ -35,11 +35,13 @@ <include>*:jbossws-jboss500:jar</include> <include>*:jbossws-jboss501:jar</include> <include>*:juddi-service:sar</include> +  </includes> </dependencySet> <dependencySet> @@ -115,7 +117,7 @@ <useStrictFiltering>true</useStrictFiltering> <scope>provided</scope> <includes> - <include>org.jboss:jbossxb:jar:1.0.0.SP1</include> + <include>org.jboss:jbossxb:jar:1.0.0.SP2</include> </includes> </dependencySet> </dependencySets>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7205 - in stack/cxf/trunk: modules/client and 3 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-05-29 06:22:54 -0400 (Thu, 29 May 2008) New Revision: 7205 Modified: stack/cxf/trunk/modules/client/pom.xml stack/cxf/trunk/modules/server/pom.xml stack/cxf/trunk/pom.xml stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2098] Adding required ws-security-related libraries Modified: stack/cxf/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/trunk/modules/client/pom.xml 2008-05-29 10:16:12 UTC (rev 7204) +++ stack/cxf/trunk/modules/client/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) @@ -76,9 +76,17 @@ <artifactId>cxf-rt-ws-policy</artifactId> </dependency> <dependency> + <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + </dependency> + <dependency> <groupId>stax</groupId> <artifactId>stax-api</artifactId> </dependency> + <dependency> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + </dependency>  <dependency> Modified: stack/cxf/trunk/pom.xml =================================================================== --- stack/cxf/trunk/pom.xml 2008-05-29 10:16:12 UTC (rev 7204) +++ stack/cxf/trunk/pom.xml 2008-05-29 10:22:54 UTC (rev 7205) @@ -55,6 +55,7 @@ <juddi.service.version>1.2.0.GA</juddi.service.version> <saaj.api.version>1.3</saaj.api.version> <fastinfoset.api.version>1.2.2</fastinfoset.api.version> + <xmlsec.version>1.3.0</xmlsec.version> </properties>  @@ -169,6 +170,11 @@  <dependency> <groupId>org.apache.cxf</groupId> + <artifactId>cxf-rt-ws-security</artifactId> + <version>${cxf.version}</version> + </dependency> + <dependency> + <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${cxf.version}</version> </dependency> @@ -247,6 +253,11 @@ <artifactId>stax-api</artifactId> <version>${cxf.stax.version}</version> </dependency> + <dependency> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + <version>${xmlsec.version}</version> + </dependency>  <dependency> Modified: stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 10:16:12 UTC (rev 7204) +++ stack/cxf/trunk/src/main/distro/jbossws-deploy-macros.xml 2008-05-29 10:22:54 UTC (rev 7205) @@ -46,6 +46,7 @@ <include name="**/spring-core.jar"/> <include name="**/stax-api.jar"/> <include name="**/wsdl4j.jar"/> + <include name="**/wss4j.jar"/> <include name="**/wstx.jar"/> <include name="**/xml-resolver.jar"/> <include name="**/XmlSchema.jar"/> @@ -84,7 +85,9 @@ <include name="**/spring-context.jar"/> <include name="**/spring-core.jar"/> <include name="**/wsdl4j.jar"/> + <include name="**/wss4j.jar"/> <include name="**/xml-resolver.jar"/> + <include name="**/xmlsec.jar"/> <include name="**/XmlSchema.jar"/> <include name="**/FastInfoset.jar"/> </patternset> @@ -380,4 +383,4 @@ </sequential> </macrodef> -</project> \ No newline at end of file +</project> Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 10:16:12 UTC (rev 7204) +++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 10:22:54 UTC (rev 7205) @@ -85,6 +85,8 @@ <include>*:xml-resolver:jar</include> <include>*:XmlSchema:jar</include> <include>*:FastInfoset:jar</include> + <include>*:wss4j:jar</include> + <include>*:xmlsec:jar</include> </includes> </dependencySet> <dependencySet>

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7204 - common/trunk/src/main/java/org/jboss/wsf/test.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 06:16:12 -0400 (Thu, 29 May 2008) New Revision: 7204 Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java Log: always restore original classloader Modified: common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java =================================================================== --- common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-05-29 09:59:17 UTC (rev 7203) +++ common/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestSetup.java 2008-05-29 10:16:12 UTC (rev 7204) @@ -148,10 +148,16 @@ protected void tearDown() throws Exception { - for (int i = 0; i < archives.length; i++) + try { - String archive = archives[archives.length - i - 1]; - delegate.undeploy(archive); + for (int i = 0; i < archives.length; i++) + { + String archive = archives[archives.length - i - 1]; + delegate.undeploy(archive); + } + } + finally + { Thread.currentThread().setContextClassLoader(originalClassLoader); } }

16 years, 7 months

1
0
0 / 0

JBossWS SVN: r7203 - stack/native/trunk/modules/testsuite/native-tests.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-05-29 05:59:17 -0400 (Thu, 29 May 2008) New Revision: 7203 Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml Log: fix resources dir Modified: stack/native/trunk/modules/testsuite/native-tests/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:43:55 UTC (rev 7202) +++ stack/native/trunk/modules/testsuite/native-tests/pom.xml 2008-05-29 09:59:17 UTC (rev 7203) @@ -52,8 +52,7 @@ <configuration> <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${test.resources.directory}"/> -  + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <ant antfile="scripts/antrun-bpel.xml" target="bpel"/> </tasks> @@ -68,8 +67,7 @@ <configuration> <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> - <property name="tests.resources.dir" value="${test.resources.directory}"/> -  + <property name="tests.resources.dir" value="${basedir}/src/test/resources"/> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="project.version" value="${project.version}"/> <ant antfile="scripts/antrun-wsconsume.xml" target="wsconsume"/> @@ -86,7 +84,6 @@ <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${test.resources.directory}"/> -  <property name="tests.output.dir" value="${project.build.directory}"/> <property name="jboss.bind.address" value="${jboss.bind.address}"/> <property name="java.jdk15.home" value="${java.jdk15.home}"/> @@ -104,7 +101,6 @@ <tasks> <property name="maven.test.classpath" refid="maven.test.classpath"/> <property name="tests.resources.dir" value="${test.resources.directory}"/> -  <property name="tests.output.dir" value="${project.build.directory}"/> <ant antfile="scripts/antrun-wsprovide.xml" target="wsprovide"/> </tasks> @@ -120,7 +116,6 @@ <tasks> <property name="tests.output.dir" value="${project.build.directory}"/> <property name="tests.resources.dir" value="${test.resources.directory}"/> -  <ant antfile="scripts/build-jars-jaxrpc.xml" target="build-jars-jaxrpc"/> <ant antfile="scripts/build-samples-jaxrpc.xml" target="build-samples-jaxrpc"/> <ant antfile="scripts/build-jars-jaxws.xml" target="build-jars-jaxws"/>

16 years, 7 months

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-05-29 05:43:55 -0400 (Thu, 29 May 2008) New Revision: 7202 Modified: stack/metro/trunk/pom.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: framework scope=runtime Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-05-29 09:43:47 UTC (rev 7201) +++ stack/metro/trunk/pom.xml 2008-05-29 09:43:55 UTC (rev 7202) @@ -272,80 +272,80 @@ </dependencies> </dependencyManagement> -  +  <dependencies> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>scripts</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-framework</artifactId> <classifier>testsuite</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss422</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss423</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <classifier>container</classifier> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss500</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <classifier>container</classifier> - <scope>provided</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.jboss.ws</groupId> <artifactId>jbossws-jboss501</artifactId> <classifier>resources</classifier> - <scope>provided</scope> + <scope>runtime</scope> <type>zip</type> </dependency> </dependencies> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:43:47 UTC (rev 7201) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-05-29 09:43:55 UTC (rev 7202) @@ -13,7 +13,7 @@ <dependencySet> <outputDirectory>bin</outputDirectory> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> + <scope>runtime</scope> <unpack>true</unpack> <includes> <include>*:jbossws-framework:zip:scripts</include> @@ -25,7 +25,7 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> + <scope>runtime</scope> <unpack>false</unpack> <includes> <include>*:jbossws-jboss422:jar:*</include> @@ -38,7 +38,7 @@ <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${artifact.artifactId}-${artifact.classifier}.${artifact.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>provided</scope> + <scope>runtime</scope> <unpack>false</unpack> <includes> <include>*:jbossws-jboss500:jar:container</include>

16 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits May 2008