JBossWS SVN: r8739 - container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-18 03:17:25 -0500 (Tue, 18 Nov 2008)
New Revision: 8739
Modified:
container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java
Log:
Using different endpoint servlet for jaxrpc and jaxws
Modified: container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java
===================================================================
--- container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2008-11-18 08:15:07 UTC (rev 8738)
+++ container/jboss42/branches/asoldano/src/main/java/org/jboss/wsf/container/jboss42/DefaultWebAppDesciptorModifierImpl.java 2008-11-18 08:17:25 UTC (rev 8739)
@@ -23,6 +23,7 @@
import org.jboss.wsf.spi.deployment.Deployment;
import org.jboss.wsf.spi.deployment.Endpoint;
+import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
import org.jboss.logging.Logger;
import org.dom4j.Document;
import org.dom4j.Element;
@@ -52,6 +53,17 @@
Element root = webXml.getRootElement();
String propKey = "org.jboss.ws.webapp.ServletClass";
+
+ DeploymentType dt = dep.getType();
+ if (DeploymentType.JAXWS_JSE.equals(dt) || DeploymentType.JAXWS_EJB3.equals(dt))
+ {
+ propKey = "org.jboss.ws.webapp.jaxws.ServletClass";
+ }
+ else
+ {
+ propKey = "org.jboss.ws.webapp.jaxrpc.ServletClass";
+ }
+
String servletClass = (String)dep.getProperty(propKey);
if (servletClass == null)
throw new IllegalStateException("Cannot obtain context property: " + propKey);
16 years, 1 month
JBossWS SVN: r8738 - container/jboss42/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-18 03:15:07 -0500 (Tue, 18 Nov 2008)
New Revision: 8738
Added:
container/jboss42/branches/asoldano/
Log:
Creating user branch
Copied: container/jboss42/branches/asoldano (from rev 8737, container/jboss42/branches/jboss423)
16 years, 1 month
JBossWS SVN: r8737 - stack/native/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-18 03:14:10 -0500 (Tue, 18 Nov 2008)
New Revision: 8737
Added:
stack/native/branches/asoldano/
Log:
Creating user branch
Copied: stack/native/branches/asoldano (from rev 8736, stack/native/trunk)
16 years, 1 month
JBossWS SVN: r8736 - stack/metro/branches.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-18 03:13:45 -0500 (Tue, 18 Nov 2008)
New Revision: 8736
Added:
stack/metro/branches/asoldano/
Log:
Creating user branch
Copied: stack/metro/branches/asoldano (from rev 8735, stack/metro/trunk)
16 years, 1 month
JBossWS SVN: r8735 - stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-14 10:11:38 -0500 (Fri, 14 Nov 2008)
New Revision: 8735
Modified:
stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
Log:
fixing classloader
Modified: stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
===================================================================
--- stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2008-11-14 14:26:13 UTC (rev 8734)
+++ stack/native/trunk/modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java 2008-11-14 15:11:38 UTC (rev 8735)
@@ -107,7 +107,7 @@
String defaultNamespace = getDefaultNamespace(wsdlDoc);
if (Constants.NS_WSDL11.equals(defaultNamespace))
{
- WSDLFactory wsdlFactory = WSDLFactory.newInstance(JBossWSDLFactoryImpl.class.getName());
+ WSDLFactory wsdlFactory = WSDLFactory.newInstance(JBossWSDLFactoryImpl.class.getName(), this.getClass().getClassLoader());
WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
wsdlReader.setFeature("javax.wsdl.verbose", false);
16 years, 1 month
JBossWS SVN: r8734 - stack/metro/trunk/modules/testsuite.
by jbossws-commits＠lists.jboss.org
Author: alessio.soldano(a)jboss.com
Date: 2008-11-14 09:26:13 -0500 (Fri, 14 Nov 2008)
New Revision: 8734
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-2400] Fixing excludes
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-14 14:08:22 UTC (rev 8733)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss422.txt 2008-11-14 14:26:13 UTC (rev 8734)
@@ -48,5 +48,8 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
+
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-14 14:08:22 UTC (rev 8733)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss423.txt 2008-11-14 14:26:13 UTC (rev 8734)
@@ -42,5 +42,8 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
+
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-14 14:08:22 UTC (rev 8733)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss424.txt 2008-11-14 14:26:13 UTC (rev 8734)
@@ -39,8 +39,11 @@
# [JBWS-2348] Fix jbws1969 testcase
org/jboss/test/ws/jaxws/jbws1969/**
+# [JBWS-2397] Fix jbws1797 testcase
+org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
+
# [JBWS-981] @WebContext defined virtual hosts only being fixed for JBoss 5
org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.*
-
-# [JBWS-2397] Fix jbws1797 testcase
-org/jboss/test/ws/jaxws/jbws1797/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-14 14:08:22 UTC (rev 8733)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss500.txt 2008-11-14 14:26:13 UTC (rev 8734)
@@ -43,3 +43,6 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
Modified: stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt
===================================================================
--- stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-14 14:08:22 UTC (rev 8733)
+++ stack/metro/trunk/modules/testsuite/test-excludes-jboss501.txt 2008-11-14 14:26:13 UTC (rev 8734)
@@ -37,3 +37,6 @@
# [JBWS-2397] Fix jbws1797 testcase
org/jboss/test/ws/jaxws/jbws1797/**
+
+# [JBWS-2400] Rewrite large attachment testcase
+org/jboss/test/ws/jaxws/jbws2000/**
16 years, 1 month
JBossWS SVN: r8733 - stack/metro/trunk.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-14 09:08:22 -0500 (Fri, 14 Nov 2008)
New Revision: 8733
Modified:
stack/metro/trunk/pom.xml
Log:
[JBWS-2296] use Sun SAAJ impl version 1.3 (because of TCK)
Modified: stack/metro/trunk/pom.xml
===================================================================
--- stack/metro/trunk/pom.xml 2008-11-14 11:50:31 UTC (rev 8732)
+++ stack/metro/trunk/pom.xml 2008-11-14 14:08:22 UTC (rev 8733)
@@ -69,6 +69,7 @@
<sun.http-transport.version>2.1.3</sun.http-transport.version>
<sun.jaxws.version>2.1.4</sun.jaxws.version>
<sun.wsit.version>1.3.1</sun.wsit.version>
+ <sun.saaj.impl.version>1.3</sun.saaj.impl.version>
<woodstox.version>3.2.6</woodstox.version>
<wsdl4j.version>1.6.1</wsdl4j.version>
</properties>
@@ -180,11 +181,16 @@
<!-- Metro dependencies -->
<dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>${sun.saaj.impl.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
<version>${sun.fastinfoset.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>com.sun.xml.stream</groupId>
<artifactId>sjsxp</artifactId>
<version>${sun.sjsxp.version}</version>
16 years, 1 month
JBossWS SVN: r8732 - stack/native/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-14 06:50:31 -0500 (Fri, 14 Nov 2008)
New Revision: 8732
Modified:
stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2399] enforce full control over the jars that will be published to deploy-artifacts dir
Modified: stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 07:08:30 UTC (rev 8731)
+++ stack/native/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 11:50:31 UTC (rev 8732)
@@ -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>
-
+
<!-- lib -->
<moduleSets>
<moduleSet>
@@ -32,33 +32,33 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:FastInfoset:jar</include>
- <include>*:jaxb-api:jar</include>
- <include>*:jaxb-impl:jar</include>
- <include>*:jaxb-xjc:jar</include>
- <include>*:jaxws-tools:jar</include>
- <include>*:jaxws-rt:jar</include>
- <include>*:jboss-jaxb-intros:jar</include>
- <include>*:jbossws-common:jar</include>
- <include>*:jbossws-native-jaxrpc:jar</include>
- <include>*:jbossws-native-jaxws:jar</include>
- <include>*:jbossws-native-jaxws-ext:jar</include>
- <include>*:jbossws-native-saaj:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:jettison:jar</include>
- <include>*:policy:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:stax-ex:jar</include>
- <include>*:streambuffer:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xmlsec:jar</include>
+ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>com.sun.xml.ws:jaxws-tools:jar</include>
+ <include>com.sun.xml.ws:jaxws-rt:jar</include>
+ <include>jboss.jaxbintros:jboss-jaxb-intros:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-jaxrpc:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-jaxws:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-jaxws-ext:jar</include>
+ <include>org.jboss.ws.native:jbossws-native-saaj:jar</include>
+ <include>org.codehaus.jettison:jettison:jar</include>
+ <include>wscommons-policy:policy:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>org.jvnet.staxex:stax-ex:jar</include>
+ <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>xml-security:xmlsec:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:wstx-lgpl:jar</include>
+ <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
</dependencySet>
</dependencySets>
@@ -81,12 +81,12 @@
<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>
- <include>*:juddi:jar</include>
- <include>*:scout:jar</include>
+ <include>org.jboss.ws:jbossws-framework:jar</include>
+ <include>org.jboss.ws:jbossws-jboss422:jar</include>
+ <include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>org.jboss.jaxr:juddi-service:sar</include>
+ <include>apache-scout:scout:jar</include>
+ <include>juddi:juddi:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -96,7 +96,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss424x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
<!-- [JBWS-2263] -->
@@ -108,7 +108,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR2:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -118,7 +118,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500x:jar</include>
</includes>
</dependencySet>
<!-- END -->
@@ -126,7 +126,7 @@
</binaries>
</moduleSet>
</moduleSets>
-
+
<fileSets>
<!-- bin -->
<fileSet>
@@ -139,7 +139,7 @@
<include>wstools.*</include>
</includes>
</fileSet>
-
+
<!-- resources -->
<fileSet>
<directory>modules/client/src/main/resources/META-INF</directory>
@@ -157,5 +157,5 @@
</includes>
</fileSet>
</fileSets>
-
+
</assembly>
16 years, 1 month
JBossWS SVN: r8731 - stack/cxf/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-14 02:08:30 -0500 (Fri, 14 Nov 2008)
New Revision: 8731
Modified:
stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2399] enforce full control over the jars that will be published to deploy-artifacts dir
Modified: stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 06:28:05 UTC (rev 8730)
+++ stack/cxf/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 07:08:30 UTC (rev 8731)
@@ -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>
@@ -22,37 +22,37 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:cxf-*</include>
- <include>*:geronimo-javamail*</include>
- <include>*:geronimo-ws-metadata*</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>*:jbossws-common:jar</include>
- <include>*:jbossws-spi:jar</include>
- <include>*:junit:jar</include>
- <include>*:neethi:jar</include>
- <include>*:saaj-api:jar</include>
- <include>*:saaj-impl:jar</include>
- <include>*:spring-beans:jar</include>
- <include>*:spring-context:jar</include>
- <include>*:spring-core:jar</include>
- <include>*:stax-api:jar</include>
- <include>*:wsdl4j:jar</include>
- <include>*:xml-resolver:jar</include>
- <include>*:XmlSchema:jar</include>
- <include>*:FastInfoset:jar</include>
- <include>*:wss4j:jar</include>
- <include>*:xmlsec:jar</include>
+ <include>org.apache.cxf:cxf-*</include>
+ <include>org.apache.geronimo.specs:geronimo-javamail*</include>
+ <include>org.apache.geronimo.specs:geronimo-ws-metadata*</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>javax.xml:jaxrpc-api:jar</include>
+ <include>javax.xml.ws:jaxws-api:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>junit:junit:jar</include>
+ <include>org.apache.neethi:neethi:jar</include>
+ <include>javax.xml.soap:saaj-api:jar</include>
+ <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include>
+ <include>org.springframework:spring-beans:jar</include>
+ <include>org.springframework:spring-context:jar</include>
+ <include>org.springframework:spring-core:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>xml-resolver:xml-resolver:jar</include>
+ <include>org.apache.ws.commons.schema:XmlSchema:jar</include>
+ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
+ <include>org.apache.ws.security:wss4j:jar</include>
+ <include>xml-security:xmlsec:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:wstx-asl:jar</include>
+ <include>org.codehaus.woodstox:wstx-asl:jar</include>
</includes>
</dependencySet>
</dependencySets>
@@ -67,7 +67,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
- <dependencySets>
+ <dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
@@ -75,10 +75,10 @@
<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>
+ <include>org.jboss.ws:jbossws-framework:jar</include>
+ <include>org.jboss.ws:jbossws-jboss422:jar</include>
+ <include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>jboss.jaxr:juddi-service:sar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -88,7 +88,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss424x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
<!-- [JBWS-2263] -->
@@ -100,7 +100,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR2:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -110,7 +110,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500x:jar</include>
</includes>
</dependencySet>
<!-- END -->
@@ -118,7 +118,6 @@
</binaries>
</moduleSet>
</moduleSets>
-
<fileSets>
<!-- bin -->
16 years, 1 month
JBossWS SVN: r8730 - stack/metro/trunk/src/main/scripts.
by jbossws-commits＠lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-11-14 01:28:05 -0500 (Fri, 14 Nov 2008)
New Revision: 8730
Modified:
stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
Log:
[JBWS-2399] enforce full control over the jars that will be published to deploy-artifacts dir
Modified: stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml
===================================================================
--- stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-13 18:38:02 UTC (rev 8729)
+++ stack/metro/trunk/src/main/scripts/assembly-deploy-artifacts.xml 2008-11-14 06:28:05 UTC (rev 8730)
@@ -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>
@@ -22,40 +22,40 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:FastInfoset:jar</include>
- <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>
- <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>
- <include>*:stax-ex: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>
+ <include>com.sun.xml.fastinfoset:FastInfoset:jar</include>
+ <include>com.sun.xml.ws:http:jar</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ <include>javax.xml:jaxrpc-api:jar</include>
+ <include>javax.xml.ws:jaxws-api:jar</include>
+ <include>com.sun.xml.ws:jaxws-local-transport:jar</include>
+ <include>com.sun.xml.ws:jaxws-rt:jar</include>
+ <include>com.sun.xml.ws:jaxws-tools:jar</include>
+ <include>com.sun.xml.ws:policy:jar</include>
+ <include>org.jboss.ws:jbossws-common:jar</include>
+ <include>org.jboss.ws:jbossws-spi:jar</include>
+ <include>javax.jws:jsr181-api:jar</include>
+ <include>javax.annotation:jsr250-api:jar</include>
+ <include>org.jvnet:mimepull:jar</include>
+ <include>com.sun.org.apache.xml.internal:resolver:jar</include>
+ <include>javax.xml.soap:saaj-api:jar</include>
+ <include>com.sun.xml.messaging.saaj:saaj-impl:jar</include>
+ <include>stax:stax-api:jar</include>
+ <include>org.jvnet.staxex:stax-ex:jar</include>
+ <include>com.sun.xml.stream.buffer:streambuffer:jar</include>
+ <include>com.sun.xml.wsit:txnannprocessor:jar</include>
+ <include>com.sun.xml.wsit:xmlsec:jar</include>
+ <include>com.sun.xml.wsit:xws-security:jar</include>
+ <include>wsdl4j:wsdl4j:jar</include>
+ <include>junit:junit:jar</include>
</includes>
</dependencySet>
<dependencySet>
<outputFileNameMapping>wstx.jar</outputFileNameMapping>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:wstx-lgpl:jar</include>
+ <include>org.codehaus.woodstox:wstx-lgpl:jar</include>
</includes>
</dependencySet>
</dependencySets>
@@ -70,7 +70,7 @@
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
<includeDependencies>false</includeDependencies>
<unpack>false</unpack>
- <dependencySets>
+ <dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
<outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping>
@@ -78,12 +78,12 @@
<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>
- <include>*:scout:jar</include>
- <include>*:juddi:jar</include>
+ <include>org.jboss.ws:jbossws-framework:jar</include>
+ <include>org.jboss.ws:jbossws-jboss422:jar</include>
+ <include>org.jboss.ws:jbossws-jboss423:jar</include>
+ <include>org.jboss.jaxr:juddi-service:sar</include>
+ <include>apache-scout:scout:jar</include>
+ <include>juddi:juddi:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -93,7 +93,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss424x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss424x:jar</include>
</includes>
</dependencySet>
<!-- JBWS-2263 -->
@@ -105,7 +105,7 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500CR2:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500CR2:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -115,19 +115,19 @@
<scope>runtime</scope>
<unpack>false</unpack>
<includes>
- <include>*:jbossws-jboss500x:jar</include>
+ <include>org.jboss.ws:jbossws-jboss500x:jar</include>
</includes>
</dependencySet>
<!-- END -->
</dependencySets>
</binaries>
</moduleSet>
- <!--
+ <!--
Does not work with maven-2.0.9
- This should include the output from module wsit
+ This should include the output from module wsit
<moduleSet>
<includes>
- <include>*:jbossws-metro-wsit:jar:*</include>
+ <include>org.jboss.ws.metro:jbossws-metro-wsit:jar:*</include>
</includes>
<binaries>
<outputDirectory>lib</outputDirectory>
@@ -137,7 +137,7 @@
</binaries>
</moduleSet-->
</moduleSets>
-
+
<fileSets>
<!-- bin -->
<fileSet>
@@ -149,7 +149,7 @@
</includes>
</fileSet>
- <!-- resources -->
+ <!-- resources -->
<fileSet>
<directory>modules/server/target/resources</directory>
<outputDirectory>resources</outputDirectory>
@@ -158,7 +158,7 @@
</includes>
</fileSet>
</fileSets>
-
+
<!-- This should be a moduleSet - see above -->
<files>
<file>
16 years, 1 month