November 2008 - jbossws-commits - Jboss List Archives

JBossWS SVN: r8729 - stack/metro/trunk/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 13:38:02 -0500 (Thu, 13 Nov 2008) New Revision: 8729 Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt Log: [JBWS-2165][JBWS-1949] Updating exclude files Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-13 18:36:59 UTC (rev 8728) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-13 18:38:02 UTC (rev 8729) @@ -8,6 +8,10 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + # [JBWS-1762] web.xml modified to web.xml.org - Subsequent runs fail org/jboss/test/ws/jaxws/jbws1762/** @@ -25,10 +29,6 @@ # [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed org/jboss/test/ws/jaxws/jbws2241/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-13 18:36:59 UTC (rev 8728) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-13 18:38:02 UTC (rev 8729) @@ -8,6 +8,10 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + # [JBWS-1841] WebServiceRef injection from DD doesn't work org/jboss/test/ws/jaxws/jbws1841/** @@ -19,10 +23,6 @@ # [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed org/jboss/test/ws/jaxws/jbws2241/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-13 18:36:59 UTC (rev 8728) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-13 18:38:02 UTC (rev 8729) @@ -8,6 +8,10 @@ # UsernameTestCase requires keystore & trustore in jboss-web tomcat configuration org/jboss/test/ws/jaxws/samples/wsse/UsernameTestCase.* +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + # [JBWS-1841] WebServiceRef injection from DD doesn't work org/jboss/test/ws/jaxws/jbws1841/** @@ -19,10 +23,6 @@ # [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/jbws2000/** -org/jboss/test/ws/jaxws/samples/xop/** - # [JBWS-2240] PortComponent from jboss.xml descriptor is not parsed org/jboss/test/ws/jaxws/jbws2241/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-13 18:36:59 UTC (rev 8728) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-13 18:38:02 UTC (rev 8729) @@ -13,6 +13,10 @@ # [JBMETA-141] Implement getChildren() in VirtualFileAdaptor org/jboss/test/ws/jaxws/jbws2206/** +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + # [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" org/jboss/test/ws/jaxws/binding/** org/jboss/test/ws/jaxws/handlerscope/** @@ -21,10 +25,6 @@ # [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/** Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt =================================================================== --- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-13 18:36:59 UTC (rev 8728) +++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-13 18:38:02 UTC (rev 8729) @@ -7,6 +7,10 @@ # [EJBTHREE-1152] service-ref in ejb-jar.xml is ignored org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefEJBTestCase.* +# [JBWS-1949] Metro MTOM ignores content-type on attachment part +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBare*.* +org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrapped*.* + # [JBWS-2127] Cannot generate WSDL for binding "http://www.w3.org/2003/05/soap/bindings/HTTP/" org/jboss/test/ws/jaxws/binding/** org/jboss/test/ws/jaxws/handlerscope/** @@ -15,10 +19,6 @@ # [JBWS-2131] NoSuchElementException during wsdl generation at deploy org/jboss/test/ws/jaxws/jbws1702/** -# [JBWS-2165] Fix xop tests with maven build -org/jboss/test/ws/jaxws/samples/xop/** -org/jboss/test/ws/jaxws/jbws2000/** - # [JBWS-2247] Write test for JBWS-1190 from scratch using MessageContext properties org/jboss/test/ws/jaxws/jbws1190/**

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8728 - framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 13:36:59 -0500 (Thu, 13 Nov 2008) New Revision: 8728 Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java Log: [JBWS-2165] Fixing mtom tests with Metro Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-11-13 16:53:36 UTC (rev 8727) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPBase.java 2008-11-13 18:36:59 UTC (rev 8728) @@ -166,7 +166,7 @@ try { BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content)); - content = br.readLine(); + return br.readLine(); } finally { Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-11-13 16:53:36 UTC (rev 8727) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/samples/xop/doclit/XOPWrappedTestCase.java 2008-11-13 18:36:59 UTC (rev 8728) @@ -81,16 +81,23 @@ assertEquals("Server data", content); assertEquals("text/plain", contentType); } - + protected Object getContent(DataHandler dh) throws IOException { Object content = dh.getContent(); - + // Metro returns an ByteArrayInputStream if (content instanceof InputStream) { - BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content)); - content = br.readLine(); + try + { + BufferedReader br = new BufferedReader(new InputStreamReader((InputStream)content)); + return br.readLine(); + } + finally + { + ((InputStream)content).close(); + } } return content; }

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8727 - stack/metro/trunk.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 11:53:36 -0500 (Thu, 13 Nov 2008) New Revision: 8727 Modified: stack/metro/trunk/pom.xml Log: [JBWS-2334] Excluding sjsxp dependency on client side (it's already replaced by wstx on server side) Modified: stack/metro/trunk/pom.xml =================================================================== --- stack/metro/trunk/pom.xml 2008-11-13 16:15:24 UTC (rev 8726) +++ stack/metro/trunk/pom.xml 2008-11-13 16:53:36 UTC (rev 8727) @@ -203,6 +203,12 @@ <groupId>com.sun.xml.ws</groupId> <artifactId>jaxws-rt</artifactId> <version>${sun.jaxws.version}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.sun.xml.ws</groupId>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8726 - stack/metro/trunk/src/main/distro.

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-13 11:15:24 -0500 (Thu, 13 Nov 2008) New Revision: 8726 Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml Log: do not use thirdparty dir Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 16:14:11 UTC (rev 8725) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 16:15:24 UTC (rev 8726) @@ -22,7 +22,7 @@ </filterset> <path id="jbws-ant.path"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + <pathelement location="${jboss.client}/jbossws-common.jar" /> </path> <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> @@ -130,4 +130,4 @@ <echo message="Project type: ${project.type}"/> </target> -</project> \ No newline at end of file +</project>

16 years, 1 month

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-13 11:14:11 -0500 (Thu, 13 Nov 2008) New Revision: 8725 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/src/main/distro/build-project-gen.xml stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml Log: [JBWS-2376] rollback Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -24,28 +24,28 @@ </patternset> <patternset id="jbossws.client.patternset"> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> - <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> - <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> - <include name="**/sun-jaxws/lib/jaxws-api.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> - <include name="**/com/sun/xml/ws/lib/policy.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> - <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxws-tools.jar"/> + <include name="**/jaxws-rt.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/policy.jar"/> + <include name="**/streambuffer.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/stax-ex.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> </patternset> <patternset id="jbossws.lib.patternset"> @@ -53,47 +53,52 @@ </patternset> <patternset id="jbossws.lib.endorsed.patternset"> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> + <include name="**/jboss-jaxrpc.jar"/> + <include name="**/jboss-jaxws.jar"/> + <include name="**/jboss-jaxws-ext.jar"/> + <include name="**/jboss-saaj.jar"/> + <include name="**/jaxb-api.jar"/> </patternset> <patternset id="jbossws.server.lib.patternset"> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-spi.jar"/> - <include name="**/sun-jaxws/lib/jaxws-api.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/> + <include name="**/jbossws-spi.jar"/> + <include name="**/jaxws-api.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/stax-api.jar"/> </patternset> <patternset id="jbossws.service.lib.patternset"> - <include name="**/com/sun/xml/fastinfoset/lib/FastInfoset.jar"/> - <include name="**/com/sun/xml/ws/lib/http.jar"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/sun-jaxb/lib/jaxb-xjc.jar"/> - <include name="**/javax/xml/lib/jaxrpc-api.jar"/> - <include name="**/com/sun/xml/ws/lib/jaxws-local-transport.jar"/> - <include name="**/sun-jaxws/lib/jaxws-rt.jar"/> - <include name="**/sun-jaxws/lib/jaxws-tools.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-client.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-server.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-rt.jar"/> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-wsit-tools.jar"/> - <include name="**/javax/jws/lib/jsr181-api.jar"/> - <include name="**/javax/annotation/lib/jsr250-api.jar"/> - <include name="**/com/sun/xml/ws/lib/policy.jar"/> - <include name="**/org/jvnet/staxex/lib/mimepull.jar"/> - <include name="**/com/sun/org/apache/xml/internal/lib/resolver.jar"/> - <include name="**/javax/xml/soap/lib/saaj-api.jar"/> - <include name="**/com/sun/xml/messaging/saaj/lib/saaj-impl.jar"/> - <include name="**/org/jvnet/staxex/lib/stax-ex.jar"/> - <include name="**/com/sun/xml/stream/buffer/lib/streambuffer.jar"/> - <include name="**/com/sun/xml/wsit/lib/txnannprocessor.jar"/> - <include name="**/ibm-wsdl4j/lib/wsdl4j.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> - <include name="**/com/sun/xml/wsit/lib/xmlsec.jar"/> - <include name="**/com/sun/xml/wsit/lib/xws-security.jar"/> + <include name="**/FastInfoset.jar"/> + <include name="**/http.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/jaxb-xjc.jar"/> + <include name="**/jaxrpc-api.jar"/> + <include name="**/jaxws-local-transport.jar"/> + <include name="**/jaxws-rt.jar"/> + <include name="**/jaxws-tools.jar"/> + <include name="**/jbossws-metro-client.jar"/> + <include name="**/jbossws-metro-server.jar"/> + <include name="**/jbossws-metro-wsit-rt.jar"/> + <include name="**/jbossws-metro-wsit-tools.jar"/> + <include name="**/jsr181-api.jar"/> + <include name="**/jsr250-api.jar"/> + <include name="**/mimepull.jar"/> + <include name="**/policy.jar"/> + <include name="**/resolver.jar"/> + <include name="**/saaj-api.jar"/> + <include name="**/saaj-impl.jar"/> + <include name="**/stax-ex.jar"/> + <include name="**/stax-utils.jar"/> + <include name="**/streambuffer.jar"/> + <include name="**/txnannprocessor.jar"/> + <include name="**/wsdl4j.jar"/> + <include name="**/wstx.jar"/> + <include name="**/xmlsec.jar"/> + <include name="**/xws-security.jar"/> </patternset>  @@ -138,10 +143,10 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.lib.patternset"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> </fileset> </copy> </sequential> @@ -177,7 +182,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.client.patternset"/> - <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -194,7 +199,7 @@ <patternset refid="jbossws.client.patternset"/>   - <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/>  </fileset> </copy> @@ -214,7 +219,7 @@ <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.server.lib.patternset"/> - <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/> </fileset> </copy> </sequential> @@ -245,13 +250,13 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/jaxr/lib/juddi-service.sar"/> + <include name="**/juddi-service.sar"/> </fileset> </unzip> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/juddi/lib/juddi.jar"/> - <include name="**/apache-scout/lib/scout.jar"/> + <include name="**/juddi.jar"/> + <include name="**/scout.jar"/> </fileset> </copy> </sequential> @@ -271,15 +276,15 @@ <copy todir="@{targetdir}" flatten="true"> <fileset dir="@{thirdpartydir}"> <patternset refid="jbossws.service.lib.patternset"/> - <include name="**/sun-jaxb/lib/jaxb-api.jar"/> - <include name="**/sun-jaxb/lib/jaxb-impl.jar"/> - <include name="**/stax-api/lib/stax-api.jar"/> - <include name="**/woodstox/lib/wstx.jar"/> + <include name="**/jaxb-api.jar"/> + <include name="**/jaxb-impl.jar"/> + <include name="**/stax-api.jar"/> + <include name="**/wstx.jar"/> </fileset> </copy> <unzip dest="@{targetdir}/jbossws-management.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> <copy todir="@{targetdir}/jbossws.beans"> @@ -302,7 +307,7 @@ <mkdir dir="@{targetdir}"/> <unzip dest="@{targetdir}/jbossws-management.war"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/metro/lib/jbossws-metro-management.war"/> + <include name="**/jbossws-metro-management.war"/> </fileset> </unzip> </sequential> @@ -331,11 +336,11 @@ </copy> <copy todir="@{targetdir}" flatten="true" overwrite="true"> <fileset dir="@{thirdpartydir}"> - <include name="**/org/jboss/ws/lib/jbossws-common.jar"/> - <include name="**/org/jboss/ws/lib/jbossws-framework.jar"/> + <include name="**/jbossws-common.jar"/> + <include name="**/jbossws-framework.jar"/>   - <include name="**/org/jboss/ws/lib/jbossws-(a){jbossid}.jar"/> + <include name="**/jbossws-(a){jbossid}.jar"/>  </fileset> </copy> Modified: stack/metro/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/src/main/distro/build-project-gen.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -22,7 +22,7 @@ </filterset> <path id="jbws-ant.path"> - <pathelement location="${jboss.client}/jbossws-common.jar" /> + <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> </path> <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/> Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml =================================================================== --- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 15:37:28 UTC (rev 8724) +++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 16:14:11 UTC (rev 8725) @@ -1,12 +1,12 @@ <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>deploy-artifacts</id> <formats> <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> - + <moduleSets> <moduleSet> <includes> @@ -14,201 +14,50 @@ <include>org.jboss.ws.metro:jbossws-metro-server</include> </includes> <binaries> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <includeDependencies>false</includeDependencies> <unpack>false</unpack> <dependencySets> <dependencySet> - <outputDirectory>lib/com/sun/xml/wsit/lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> <includes> - <include>*:txnannprocessor:jar</include> - <include>*:xmlsec:jar</include> - <include>*:xws-security:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/org/apache/xml/internal/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:resolver:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/stream/buffer/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:streambuffer:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/jws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jsr181-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/annotation/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jsr250-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/xml/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jaxrpc-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/messaging/saaj/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:saaj-impl:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/javax/xml/soap/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:saaj-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:policy:jar</include> - <include>*:http:jar</include> - <include>*:jaxws-local-transport:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/junit/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:junit:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/ibm-wsdl4j/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:wsdl4j:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/com/sun/xml/fastinfoset/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:FastInfoset:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/sun-jaxws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> + <include>*:http:jar</include> + <include>*:jaxb-api:jar</include> + <include>*:jaxb-impl:jar</include> + <include>*:jaxb-xjc:jar</include> + <include>*:jaxrpc-api:jar</include> <include>*:jaxws-api:jar</include> + <include>*:jaxws-local-transport:jar</include> <include>*:jaxws-rt:jar</include> <include>*:jaxws-tools:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/stax-api/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> + <include>*:jbossws-common:jar</include> + <include>*:jbossws-spi:jar</include> + <include>*:jsr181-api:jar</include> + <include>*:jsr250-api:jar</include> + <include>*:mimepull:jar</include> + <include>*:policy:jar</include> + <include>*:resolver:jar</include> + <include>*:saaj-api:jar</include> + <include>*:saaj-impl:jar</include> <include>*:stax-api:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/org/jvnet/staxex/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:stax-ex:jar</include> - <include>*:mimepull:jar</include> + <include>*:streambuffer:jar</include> + <include>*:txnannprocessor:jar</include> + <include>*:wsdl4j:jar</include> + <include>*:xmlsec:jar</include> + <include>*:xws-security:jar</include> + <include>*:junit:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-common:jar</include> - <include>*:jbossws-spi:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/woodstox/lib</outputDirectory> <outputFileNameMapping>wstx.jar</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> <includes> <include>*:wstx-lgpl:jar</include> </includes> </dependencySet> - <dependencySet> - <outputDirectory>lib/sun-jaxb/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jaxb-api:jar</include> - <include>*:jaxb-impl:jar</include> - <include>*:jaxb-xjc:jar</include> - </includes> - </dependencySet> </dependencySets> </binaries> </moduleSet> @@ -217,55 +66,28 @@ <include>org.jboss.ws.metro:jbossws-metro-management</include> </includes> <binaries> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <includeDependencies>false</includeDependencies> <unpack>false</unpack> - <dependencySets> + <dependencySets> <dependencySet> - <outputDirectory>lib/org/jboss/jaxr/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> <unpack>false</unpack> <includes> + <include>*:jbossws-framework:jar</include> + <include>*:jbossws-jboss422:jar</include> + <include>*:jbossws-jboss423:jar</include> <include>*:juddi-service:sar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/apache-scout/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:scout:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/juddi/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> <include>*:juddi:jar</include> </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> - <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> - <useStrictFiltering>true</useStrictFiltering> - <scope>runtime</scope> - <unpack>false</unpack> - <includes> - <include>*:jbossws-framework:jar</include> - <include>*:jbossws-jboss422:jar</include> - <include>*:jbossws-jboss423:jar</include> - </includes> - </dependencySet> - <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss424.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -277,7 +99,7 @@   <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss500.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -287,7 +109,7 @@ </includes> </dependencySet> <dependencySet> - <outputDirectory>lib/org/jboss/ws/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <outputFileNameMapping>jbossws-jboss501.${module.extension}</outputFileNameMapping> <useStrictFiltering>true</useStrictFiltering> <scope>runtime</scope> @@ -300,8 +122,22 @@ </dependencySets> </binaries> </moduleSet> +  </moduleSets> - + <fileSets>  <fileSet> @@ -309,11 +145,12 @@ <outputDirectory>bin</outputDirectory> <includes> <include>wsconsume.*</include> - <include>wsprovide.*</include> + <include>wsprovide.*</include> </includes> </fileSet> -  - <fileSet> + +  + <fileSet> <directory>modules/server/target/resources</directory> <outputDirectory>resources</outputDirectory> <includes> @@ -321,18 +158,18 @@ </includes> </fileSet> </fileSets> - + +  <files> <file> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-rt.jar</source> <destName>jbossws-metro-wsit-rt.jar</destName> </file> <file> - <outputDirectory>lib/org/jboss/ws/metro/lib</outputDirectory> + <outputDirectory>lib</outputDirectory> <source>modules/wsit/target/jbossws-metro-wsit-${project.version}-tools.jar</source> <destName>jbossws-metro-wsit-tools.jar</destName> </file> </files> - </assembly>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8724 - in stack/cxf/trunk: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 10:37:28 -0500 (Thu, 13 Nov 2008) New Revision: 8724 Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/cxf/trunk/modules/testsuite/pom.xml stack/cxf/trunk/src/main/distro/build-setup.xml Log: [JBWS-2383] use common/lib Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 15:13:18 UTC (rev 8723) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 15:37:28 UTC (rev 8724) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 15:13:18 UTC (rev 8723) +++ stack/cxf/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 15:37:28 UTC (rev 8724) @@ -352,7 +352,7 @@ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  <macro-deploy-jbossws-cxf50-sar targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> </target> Modified: stack/cxf/trunk/modules/testsuite/pom.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/pom.xml 2008-11-13 15:13:18 UTC (rev 8723) +++ stack/cxf/trunk/modules/testsuite/pom.xml 2008-11-13 15:37:28 UTC (rev 8724) @@ -477,7 +477,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/cxf/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/cxf/trunk/src/main/distro/build-setup.xml 2008-11-13 15:13:18 UTC (rev 8723) +++ stack/cxf/trunk/src/main/distro/build-setup.xml 2008-11-13 15:37:28 UTC (rev 8724) @@ -49,7 +49,7 @@ <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}/server/lib"/> + <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"/>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8723 - in stack/native/trunk: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 10:13:18 -0500 (Thu, 13 Nov 2008) New Revision: 8723 Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/native/trunk/modules/testsuite/pom.xml stack/native/trunk/src/main/distro/build-setup.xml Log: [JBWS-2383] use common/lib Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 14:47:08 UTC (rev 8722) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 15:13:18 UTC (rev 8723) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 14:47:08 UTC (rev 8722) +++ stack/native/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 15:13:18 UTC (rev 8723) @@ -376,7 +376,7 @@ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> Modified: stack/native/trunk/modules/testsuite/pom.xml =================================================================== --- stack/native/trunk/modules/testsuite/pom.xml 2008-11-13 14:47:08 UTC (rev 8722) +++ stack/native/trunk/modules/testsuite/pom.xml 2008-11-13 15:13:18 UTC (rev 8723) @@ -522,7 +522,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/native/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/native/trunk/src/main/distro/build-setup.xml 2008-11-13 14:47:08 UTC (rev 8722) +++ stack/native/trunk/src/main/distro/build-setup.xml 2008-11-13 15:13:18 UTC (rev 8723) @@ -49,7 +49,7 @@ <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}/server/lib"/>  + <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"/>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8722 - in stack/metro/trunk: modules/testsuite and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 09:47:08 -0500 (Thu, 13 Nov 2008) New Revision: 8722 Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml stack/metro/trunk/modules/testsuite/pom.xml stack/metro/trunk/src/main/distro/build-setup.xml Log: [JBWS-2383] use common/lib Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 14:44:00 UTC (rev 8721) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-as5-default-deploy.conf 2008-11-13 14:47:08 UTC (rev 8722) @@ -1 +1 @@ -bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar server/lib/jboss-jaxrpc.jar server/lib/jboss-jaxws-ext.jar server/lib/jboss-jaxws.jar server/lib/jboss-saaj.jar server/lib/jbossws-native-jaxrpc.jar server/lib/jbossws-native-jaxws-ext.jar server/lib/jbossws-native! -jaxws.jar server/lib/jbossws-native-saaj.jar server/lib/jbossws-common.jar server/lib/jbossws-framework.jar server/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml +bin/wsconsume.bat bin/wsconsume.sh bin/wsprovide.bat bin/wsprovide.sh bin/wsrunclient.bat bin/wsrunclient.sh bin/wstools.bat bin/wstools.sh client/jettison.jar client/jaxb-api.jar client/jaxb-impl.jar client/jaxb-xjc.jar client/jaxws-rt.jar client/jaxws-tools.jar client/jboss-jaxrpc.jar client/jboss-jaxws-ext.jar client/jboss-jaxws.jar client/jboss-saaj.jar client/jbossws-native-jaxrpc.jar client/jbossws-native-jaxws-ext.jar client/jbossws-native-jaxws.jar client/jbossws-native-saaj.jar client/jbossws-client.jar client/jbossws-native-client.jar client/jbossws-native-core.jar client/jbossws-common.jar client/jbossws-framework.jar client/jbossws-spi.jar client/policy.jar client/stax-ex.jar client/streambuffer.jar client/wsdl4j.jar lib/jaxb-api.jar lib/jaxb-impl.jar common/lib/jboss-jaxrpc.jar common/lib/jboss-jaxws-ext.jar common/lib/jboss-jaxws.jar common/lib/jboss-saaj.jar common/lib/jbossws-native-jaxrpc.jar common/lib/jbossws-native-jaxws-ext.jar common/lib/jbossws-native! -jaxws.jar common/lib/jbossws-native-saaj.jar common/lib/jbossws-common.jar common/lib/jbossws-framework.jar common/lib/jbossws-spi.jar server/default/deploy/jbossws.sar server/default/deploy/juddi-service.sar server/default/deploy/jbossws-container-jboss-beans.xml server/default/deployers/jbossws.deployer/FastInfoset.jar server/default/deployers/jbossws.deployer/jboss-jaxb-intros.jar server/default/deployers/jbossws.deployer/jbossws-native-core.jar server/default/deployers/jbossws.deployer/jettison.jar server/default/deployers/jbossws.deployer/policy.jar server/default/deployers/jbossws.deployer/wsdl4j.jar server/default/deployers/jbossws.deployer/xmlsec.jar server/default/deployers/jbossws.deployer/META-INF/jbossws-container-jboss-beans.xml Modified: stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml =================================================================== --- stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 14:44:00 UTC (rev 8721) +++ stack/metro/trunk/modules/resources/src/main/resources/resources/jbossws-deploy-macros.xml 2008-11-13 14:47:08 UTC (rev 8722) @@ -380,7 +380,7 @@ <macro-deploy-jbossws-bin targetdir="${installserver}/../../bin" artifactsdir="${artifactsdir}"/> <macro-deploy-jbossws-client50 targetdir="${installserver}/../../client" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-lib50 targetdir="${installserver}/../../lib" thirdpartydir="${thirdpartydir}"/> - <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  + <macro-deploy-jbossws-server-lib50 targetdir="${installserver}/../../common/lib" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/>  <macro-deploy-jbossws-sar50 targetdir="${installserver}/deploy/jbossws.sar" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-jbossws-deployers50 targetdir="${installserver}/deployers/jbossws.deployer/" artifactsdir="${artifactsdir}" thirdpartydir="${thirdpartydir}" jbossid="${jbossid}"/> <macro-deploy-juddi-sar targetdir="${installserver}/deploy/juddi-service.sar" thirdpartydir="${thirdpartydir}"/> Modified: stack/metro/trunk/modules/testsuite/pom.xml =================================================================== --- stack/metro/trunk/modules/testsuite/pom.xml 2008-11-13 14:44:00 UTC (rev 8721) +++ stack/metro/trunk/modules/testsuite/pom.xml 2008-11-13 14:47:08 UTC (rev 8722) @@ -538,7 +538,7 @@  <additionalClasspathElements> <additionalClasspathElement>${jboss.home}/client/jbossall-client.jar</additionalClasspathElement> - <additionalClasspathElement>${jboss.home}/server/lib/jboss-ejb3-core.jar</additionalClasspathElement> + <additionalClasspathElement>${jboss.home}/common/lib/jboss-ejb3-core.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> </plugin> Modified: stack/metro/trunk/src/main/distro/build-setup.xml =================================================================== --- stack/metro/trunk/src/main/distro/build-setup.xml 2008-11-13 14:44:00 UTC (rev 8721) +++ stack/metro/trunk/src/main/distro/build-setup.xml 2008-11-13 14:47:08 UTC (rev 8722) @@ -48,7 +48,7 @@ <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}/server/lib"/> + <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"/>

16 years, 1 month

1
0
0 / 0

JBossWS SVN: r8721 - framework/trunk/testsuite/test/ant-import.

by jbossws-commits＠lists.jboss.org

Author: alessio.soldano(a)jboss.com Date: 2008-11-13 09:44:00 -0500 (Thu, 13 Nov 2008) New Revision: 8721 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml Log: [JBWS-2383] use common/lib Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-11-13 12:25:44 UTC (rev 8720) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-11-13 14:44:00 UTC (rev 8721) @@ -87,8 +87,8 @@ <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> - <condition property="jboss.server.lib" value="${jboss.home}/server/lib" else="${jboss.server}/lib"> - <available file="${jboss.home}/server/lib"/> + <condition property="jboss.server.lib" value="${jboss.home}/common/lib" else="${jboss.server}/lib"> + <available file="${jboss.home}/common/lib"/> </condition>  <property name="jboss.server.deploy" value="${jboss.server}/deploy"/>

16 years, 1 month

1
0
0 / 0

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

by jbossws-commits＠lists.jboss.org

Author: richard.opalka(a)jboss.com Date: 2008-11-13 07:25:44 -0500 (Thu, 13 Nov 2008) New Revision: 8720 Modified: stack/native/trunk/src/main/distro/build-project-gen.xml Log: fix Modified: stack/native/trunk/src/main/distro/build-project-gen.xml =================================================================== --- stack/native/trunk/src/main/distro/build-project-gen.xml 2008-11-13 11:54:05 UTC (rev 8719) +++ stack/native/trunk/src/main/distro/build-project-gen.xml 2008-11-13 12:25:44 UTC (rev 8720) @@ -22,7 +22,7 @@ </filterset> <path id="jbws-ant.path"> - <pathelement location="${thirdparty.dir}/jbossws-common.jar" /> + <pathelement location="${jboss.client}/jbossws-common.jar" /> </path> <taskdef name="pathFixer" classname="org.jboss.ws.tools.ant.FixPathTask" classpathref="jbws-ant.path"/> <taskdef name="eclipseClasspathGenerator" classname="org.jboss.ws.tools.ant.EclipseClasspathTask" classpathref="jbws-ant.path"/>

16 years, 1 month

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits November 2008