Author: thomas.diesler(a)jboss.com Date: 2008-04-18 17:22:18 -0400 (Fri, 18 Apr 2008) New Revision: 6522 Modified: stack/cxf/branches/tdiesler/trunk/build.xml stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml stack/cxf/branches/tdiesler/trunk/pom.xml Log: Use jbossws-parent Modified: stack/cxf/branches/tdiesler/trunk/build.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 20:20:41 UTC (rev 6521) +++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-18 21:22:18 UTC (rev 6522) @@ -95,13 +95,11 @@ <!-- ================================================================== --> <target name="clean" depends="prepare" description="Cleans up most generated files."> - <delete dir="${cxf.output.dir}"/> + <exec dir="${basedir}" executable="mvn" failonerror="true"> + <arg value="clean"/> + </exec> </target> - <target name="clobber" depends="clean" description="Cleans up all generated files."> - <delete dir="${int.cxf.dir}/thirdparty"/> - </target> - <target name="main" description="Executes the default target (most)." depends="most"/> <target name="most" description="Builds almost everything." depends="jars,tests-main"/> Modified: stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-18 20:20:41 UTC (rev 6521) +++ stack/cxf/branches/tdiesler/trunk/modules/client/pom.xml 2008-04-18 21:22:18 UTC (rev 6522) @@ -14,7 +14,23 @@ <!-- Dependencies --> <dependencies> + + <!-- jbossws dependencies --> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + + <!-- CXF dependencies --> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> </dependency> @@ -42,22 +58,13 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> </dependency> + + <!-- jboss provided --> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> + </dependencies> </project> Modified: stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 20:20:41 UTC (rev 6521) +++ stack/cxf/branches/tdiesler/trunk/modules/server/pom.xml 2008-04-18 21:22:18 UTC (rev 6522) @@ -15,12 +15,40 @@ <!-- Dependencies --> <dependencies> + + <!-- jbossws dependencies --> <dependency> - <groupId>jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <type>sar</type> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> </dependency> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + </dependency> + <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> + </dependency> + + <!-- CXF dependencies --> + <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> </dependency> @@ -48,40 +76,19 @@ <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-ws-policy</artifactId> </dependency> + + <!-- jboss provided --> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> </dependency> + + <!-- transitve dependencies --> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <type>sar</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <classifier>scripts</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - </dependency> - <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> <!-- Plugins --> Modified: stack/cxf/branches/tdiesler/trunk/pom.xml =================================================================== --- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 20:20:41 UTC (rev 6521) +++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-18 21:22:18 UTC (rev 6522) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project 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/maven-v4_0_0.xsd"> +<project 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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <name>JBoss Web Services - Stack CXF</name> @@ -20,8 +21,11 @@ <properties> <cxf.version>2.0.5-incubator</cxf.version> <jbossws.common.version>3.0.0-SNAPSHOT</jbossws.common.version> + <jbossws.framework.version>${version}</jbossws.framework.version> <jbossws.spi.version>3.0.0-SNAPSHOT</jbossws.spi.version> <jbossws.jboss42.version>4.2.2-SNAPSHOT</jbossws.jboss42.version> + <jboss.common.version>1.2.1.GA</jboss.common.version> + <juddi.service.version>1.2.0.GA</juddi.service.version> </properties> <modules> @@ -33,19 +37,53 @@ <!-- DependencyManagement --> <dependencyManagement> <dependencies> + + <!-- jbossws dependencies --> <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-common</artifactId> + <version>${jbossws.common.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-spi</artifactId> + <version>${jbossws.spi.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${jbossws.framework.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-framework</artifactId> + <version>${version}</version> + <classifier>scripts</classifier> + <type>zip</type> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.ws</groupId> + <artifactId>jbossws-jboss42</artifactId> + <version>${jbossws.jboss42.version}</version> + <classifier>resources</classifier> + <type>zip</type> + </dependency> + + <!-- provided apis --> + <dependency> <groupId>javax.xml</groupId> <artifactId>jaxrpc-api</artifactId> <version>1.1</version> <scope>provided</scope> </dependency> + + <!-- CXF dependencies --> <dependency> - <groupId>jboss.jaxr</groupId> - <artifactId>juddi-service</artifactId> - <version>1.2.0.GA</version> - <type>sar</type> - </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-bindings-soap</artifactId> <version>${cxf.version}</version> @@ -85,46 +123,22 @@ <artifactId>cxf-rt-ws-policy</artifactId> <version>${cxf.version}</version> </dependency> + + <!-- jboss provided --> <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.5.GA</version> + <groupId>jboss.common</groupId> + <artifactId>jboss-common</artifactId> + <version>${jboss.common.version}</version> <scope>provided</scope> </dependency> + + <!-- transitve dependencies --> <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-common</artifactId> - <version>${jbossws.common.version}</version> + <groupId>jboss.jaxr</groupId> + <artifactId>juddi-service</artifactId> + <version>${juddi.service.version}</version> + <type>sar</type> </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>${version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-framework</artifactId> - <version>${version}</version> - <classifier>scripts</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-jboss42</artifactId> - <version>${jbossws.jboss42.version}</version> - <classifier>resources</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.jboss.ws</groupId> - <artifactId>jbossws-spi</artifactId> - <version>${jbossws.spi.version}</version> - </dependency> </dependencies> </dependencyManagement>