[jbossws-commits] JBossWS SVN: r7206 - in stack/native/trunk: modules/core and 5 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Thu May 29 07:30:16 EDT 2008
Author: thomas.diesler at 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 @@
<!-- provided apis -->
<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>
<!-- transitve dependencies -->
<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>
<!-- jbossws 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 -->
+ <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>bpel</id>
<phase>generate-sources</phase>
@@ -58,6 +59,7 @@
</tasks>
</configuration>
</execution>
+ -->
<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/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>
- <!-- jaxrpc-samples-wsbpel -->
+ <!-- jaxrpc-samples-wsbpel - ->
<war warfile="${tests.output.dir}/test-libs/jaxrpc-samples-wsbpel-hello.war" webxml="${tests.output.dir}/test-resources/jaxrpc/samples/wsbpel/hello/WEB-INF/web.xml">
<classes dir="${tests.output.dir}/test-classes">
<include name="org/jboss/test/ws/jaxrpc/samples/wsbpel/hello/HelloWorldService.class"/>
@@ -661,7 +661,7 @@
<metainf dir="${tests.output.dir}/wstools/resources/jaxrpc/samples/wsbpel/hello/WEB-INF">
<include name="jaxrpc-mapping.xml"/>
</metainf>
- </jar>
+ </jar-->
<!-- jaxrpc-samples-wssecurity-sign -->
<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>
<!-- DependencyManagement -->
@@ -186,6 +189,16 @@
<!-- provided apis -->
<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>
- <!-- Runtime dependencies, not visible at compile time -->
<dependencies>
+ <!-- Provided dependencies, visible to all modules -->
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Runtime dependencies, not visible at compile time -->
+ <dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
<scope>runtime</scope>
@@ -484,6 +519,7 @@
<scope>runtime</scope>
<type>sar</type>
</dependency>
+ <!--
<dependency>
<groupId>jboss.jbpm</groupId>
<artifactId>bpel</artifactId>
@@ -510,6 +546,7 @@
<artifactId>jboss-common-logging-log4j</artifactId>
<scope>provided</scope>
</dependency>
+ -->
</dependencies>
<!-- Plugins -->
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>
+ <!--
<include>*:bpel:sar</include>
<include>*:commons-collections:jar</include>
<include>*:dom4j:jar</include>
<include>*:jaxen:jar</include>
<include>*:jboss-common-logging-log4j:jar</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>
More information about the jbossws-commits
mailing list