[jbossws-commits] JBossWS SVN: r6518 - in stack/cxf/branches/tdiesler/trunk: modules/server and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Apr 18 16:18:13 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-18 16:18:13 -0400 (Fri, 18 Apr 2008)
New Revision: 6518
Modified:
stack/cxf/branches/tdiesler/trunk/.classpath
stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/profiles-example.xml
Log:
Use jbossws-parent
Modified: stack/cxf/branches/tdiesler/trunk/.classpath
===================================================================
--- stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/.classpath 2008-04-18 20:18:13 UTC (rev 6518)
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry kind="src" output="modules/server/target/classes" path="modules/server/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/server/src/main/resources/jbossws-cxf-server.jar" path="modules/server/src/main/resources/jbossws-cxf-server.jar"/>
+ <classpathentry excluding="**" kind="src" output="modules/server/src/main/resources/jbossws-cxf.sar" path="modules/server/src/main/resources/jbossws-cxf.sar"/>
+ <classpathentry kind="src" output="modules/client/target/classes" path="modules/client/src/main/java"/>
+ <classpathentry excluding="**" kind="src" output="modules/client/src/main/resources" path="modules/client/src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -73,12 +73,14 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
<classifier>resources</classifier>
<type>zip</type>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/modules/testsuite/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -94,17 +94,27 @@
</activation>
<properties>
<jboss.version>4.2.2.GA</jboss.version>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
+ <!-- versions defined in build/build-thirdparty.xml -->
+ <jboss.remoting.version>2.2.2.SP1</jboss.remoting.version>
+ <jboss.serialization.version>1.0.3.GA</jboss.serialization.version>
</properties>
<dependencies>
<dependency>
+ <groupId>org.jboss.client</groupId>
+ <artifactId>jbossall-client</artifactId>
+ <version>${jboss.version}</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>jboss</groupId>
<artifactId>jboss-serialization</artifactId>
- <version>1.0.3.GA</version>
+ <version>${jboss.serialization.version}</version>
</dependency>
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- <version>2.2.2.SP1</version>
+ <version>${jboss.remoting.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -126,30 +136,27 @@
<artifactId>jbosssx-client</artifactId>
<version>${jboss.version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <artifactId>jbossws-cxf-client</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-cxf-client</artifactId>
- <version>${version}</version>
+ <artifactId>jbossws-common</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-framework</artifactId>
- <version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -9,23 +9,19 @@
<version>3.0.2-SNAPSHOT</version>
- <organization>
- <name>JBoss, a division of Red Hat</name>
- <url>http://www.jboss.org</url>
- </organization>
- <url>http://maven.apache.org</url>
-
<!-- Parent -->
<parent>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-parent</artifactId>
- <version>3</version>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
<properties>
- <jboss.integration.target>jboss422</jboss.integration.target>
- <cxf-version>2.0.5-incubator</cxf-version>
+ <cxf.version>2.0.5-incubator</cxf.version>
+ <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version>
+ <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version>
+ <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version>
</properties>
<modules>
@@ -52,42 +48,42 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>${cxf-version}</version>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
@@ -98,7 +94,7 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-common</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${jbossws.common.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
@@ -115,19 +111,19 @@
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>${jbossws.jboss42.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-jboss42</artifactId>
- <version>4.2.2-SNAPSHOT</version>
+ <version>${jbossws.jboss42.version}</version>
<classifier>resources</classifier>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <version>${jbossws.spi.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -172,4 +168,4 @@
<layout>legacy</layout>
</repository>
</repositories>
-</project>
\ No newline at end of file
+</project>
Modified: stack/cxf/branches/tdiesler/trunk/profiles-example.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 20:18:04 UTC (rev 6517)
+++ stack/cxf/branches/tdiesler/trunk/profiles-example.xml 2008-04-18 20:18:13 UTC (rev 6518)
@@ -9,7 +9,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <jboss.integration.target>jboss422</jboss.integration.target>
+ <jbossws.integration.target>jboss422</jbossws.integration.target>
<jboss421.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA</jboss421.home>
<jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home>
<jboss423.home>/home/tdiesler/svn/jbossas/branches/Branch_4_2/build/output/jboss-4.2.3.GA</jboss423.home>
More information about the jbossws-commits
mailing list